487 files changed, 0 insertions, 152376 deletions

diff --git a/BibleTime.kdevelop b/BibleTime.kdevelop
deleted file mode 100644
index 09dca47..0000000
--- a/BibleTime.kdevelop
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version = '1.0'?>
-<kdevelop>
-  <general>
-    <author>The BibleTime team</author>
-    <email>info@bibletime.info</email>
-    <projectmanagement>KDevAutoProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <ignoreparts>
-      <part>KDevFileView</part>
-      <part>KDevPerforce</part>
-    </ignoreparts>
-    <version>1.4</version>
-    <description/>
-    <projectdirectory>.</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
-    <secondaryLanguages>
-      <language>Perl</language>
-    </secondaryLanguages>
-  </general>
-  <kdevautoproject>
-    <general>
-      <activetarget>src/BibleTime</activetarget>
-      <useconfiguration>default</useconfiguration>
-    </general>
-    <run>
-      <mainprogram>bibletime/bibletime</mainprogram>
-      <programargs/>
-      <terminal>false</terminal>
-      <autocompile>true</autocompile>
-      <envvars/>
-      <directoryradio>executable</directoryradio>
-      <customdirectory>/</customdirectory>
-    </run>
-    <makeenvvars/>
-    <envvars/>
-    <make>
-      <abortonerror>true</abortonerror>
-      <numberofjobs>1</numberofjobs>
-      <dontact>false</dontact>
-      <makebin/>
-      <envvars>
-        <envvar value="1" name="WANT_AUTOCONF_2_5" />
-        <envvar value="1" name="WANT_AUTOMAKE_1_6" />
-      </envvars>
-    </make>
-  </kdevautoproject>
-  <kdevdebugger>
-    <general>
-      <dbgshell>libtool</dbgshell>
-      <programargs/>
-      <gdbpath/>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-      <runappinappdirectory>true</runappinappdirectory>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
-    </general>
-    <display>
-      <staticmembers>false</staticmembers>
-      <demanglenames>true</demanglenames>
-    </display>
-  </kdevdebugger>
-  <kdevdoctreeview>
-    <projectdoc>
-      <userdocDir/>
-      <apidocDir/>
-    </projectdoc>
-    <ignoreqt_xml/>
-    <ignoredoxygen/>
-    <ignorekdocs/>
-    <ignoretocs/>
-    <ignoredevhelp/>
-  </kdevdoctreeview>
-  <cppsupportpart>
-    <codecompletion>
-      <codehinting outputview="1" enablech="1" selectview="0" />
-    </codecompletion>
-    <classstore>
-      <enablepcs>false</enablepcs>
-      <enablepp>false</enablepp>
-      <preparsing/>
-    </classstore>
-    <filetemplates>
-      <choosefiles>false</choosefiles>
-      <interfaceURL/>
-      <implementationURL/>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-      <lowercasefilenames>true</lowercasefilenames>
-    </filetemplates>
-  </cppsupportpart>
-  <kdevclassview>
-    <folderhierarchy>true</folderhierarchy>
-    <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevfileview>
-    <groups>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-    </groups>
-    <tree>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-    </tree>
-  </kdevfileview>
-  <kdevcvs>
-    <cvsoptions>-z3 -f</cvsoptions>
-    <commitoptions/>
-    <updateoptions>-dP</updateoptions>
-    <addoptions/>
-    <removeoptions>-f</removeoptions>
-    <diffoptions>-u3 -p</diffoptions>
-    <logoptions/>
-    <revertoptions>-C -d -P</revertoptions>
-    <rshoptions/>
-  </kdevcvs>
-  <kdevcppsupport>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>true</includeTypedefs>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <headerCompletionDelay>250</headerCompletionDelay>
-    </codecompletion>
-    <references/>
-  </kdevcppsupport>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes/>
-  </kdevfilecreate>
-</kdevelop>
diff --git a/BibleTime.kdevelop.pcs b/BibleTime.kdevelop.pcs
deleted file mode 100644
index b3b6af6..0000000
--- a/BibleTime.kdevelop.pcs
+++ /dev/null
diff --git a/BibleTime.kdevses b/BibleTime.kdevses
deleted file mode 100644
index 39e3e5e..0000000
--- a/BibleTime.kdevses
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE KDevPrjSession>
-<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="0" />
- <pluginList>
-  <kdevvalgrind>
-   <executable path="" params="" />
-   <valgrind path="" params="" />
-  </kdevvalgrind>
-  <kdevsubversion>
-   <subversion recurseresolve="1" recurserelocate="1" recursemerge="1" recursecommit="1" base="" recursepropget="1" recurseswitch="1" recurseupdate="1" recursepropset="1" recursediff="1" recurserevert="1" forcemove="1" recursecheckout="1" forceremove="1" recurseadd="1" recurseproplist="1" forcemerge="1" />
-  </kdevsubversion>
-  <kdevdebugger>
-   <breakpointList/>
-  </kdevdebugger>
-  <kdevbookmarks>
-   <bookmarks/>
-  </kdevbookmarks>
- </pluginList>
-</KDevPrjSession>
diff --git a/COPYING b/COPYING
deleted file mode 100644
index b7db6eb..0000000
--- a/COPYING
+++ /dev/null
@@ -1,280 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, 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
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 3efc7da..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,576 +0,0 @@
-2004-01-29 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-  * BibleTime 1.4.1 release
-    -Bugfixes, especially in the Sword setup dialog part
-    -Changed default icons to crystalsvg
-    -Updated GUI translations
-
-2003-12-28 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-  * BibleTime 1.4 release
-    -New SwordSetup Dialog to setup Sword's configuration, to install modules from remote or local sources and to uninstall modules.
-    -Bugfixes
-
-2003-08-28 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-  * Released BibleTime 1.3. Major changes are:
-    -Redesign of the main index; bookmarks are seperated into an own folder, modules are sorted by type and language;
-     better menu structure
-    -Better bookmark file format, bookmarks are saved now in XML. Old bookmarks can still be imported.
-    -Improved Drag&Drop to work with multiple items, e.g. twenty search result items
-    -Redesign of the search dialog; it's easier to use now and better to navigate
-    -Better support for GenBooks (Generic Books)
-    -Improved support for writing commentaries. There's a plain text editor and a WYSIWYG editor now.
-    -BibleTime 1.3 requires Sword 1.5.6 now
-    -Many, many bugs and memory leaks fixed
-    -Updates to all translations, including new languages
-  We're sorry for the long time it took to prepare the 1.3 release! We hope to improve release cycles with the next
-  releases.
-
-2003-03-10 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-  * Fixed BibleTime to work in all places with the new SWBuffer class. Should be now more bug free.
-
-2003-02-28 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-  * Released 1.3rc1 which uses a Sword snapshot. We're in message freeze now - translators can finally start.
-  * Fixed BT to use Sword's new filter stuff
-
-2003-01-19 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-  * Fixed BT_BASICFILTER::ProcessRWPRefs, made simpled and more bug free
-
-2003-01-18 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-  * Removed install instructions from CResMgr and the actions XML file
-  * Fixed missing insertion of KAction objects into our KAccel object
-
-2003-01-17 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-  * Removed installation instructions, the webpage and README/INSTALL files are good enough
-
-2003-01-16 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-  * Bugfixes:
-    -Loading of profiles switched of auto-cascading and auto-tiling
-    -Debugged CMDIArea, was old, buggy code. Should work now more robust.
-  * Code cleanups for CDisplayWindow
-
-2003-01-14 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-  * Last fixes for beta4:
-    -Changes everything to use CResMgr instead of ugly #defined
-    -Added support for new Red letter words strip filter
-    -Everything is now in CResMgr
-    -Many small bugfixes
-
-2003-01-11 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-  * Searchdialog search result page highlights searched text
-  * Default color of strongs and morph codes changed to Qt::darkBlue
-
-2003-01-07 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-  * Major speed improvements for displaying lexicons together
-
-2003-01-04 Martin Gruner <mg.pub@gmx.net>
-  * Release 1.3beta3 release
-  * Changes in comparision with 1.2.x:
-    - New main index with better module grouping (using language and type), better bookmark format (XML),
-      import for old bookmarks from 1.2.2
-    - Drag&Drop works now with multiple items (e.g. 200 search result items)
-    - Many more changes we don't remember
-
-2002-06-02 Martin Gruner <mg.pub@gmx.net>
-	* Moved the english docs to bibletime/docs, and the pot file to bibletime/pot.
-	  Created a new package bibletime-i18n-de for German docs, with the folders docs/ and po/.
-	  Revised gen_am.sh file to suit the new arrangement, and it does at least run and create all the 
-	  necessary Makefile.am files for English and German.
-
-2002-05-03  Martin <mg.pub@gmx.net>
-
-	* Ported to KDE3: BibleTime 1.2. No new features. Text rendering works much better now
-		(right-to-left), as well as font / charset handling -- thanks to Trolltech.
-
-2002-10-04 Martin Gruner
-	* Differences between 1.0 and 1.1:
-		- Improved interface:
-			o Better optionsdialog: Better structure, more powerful settings
-			o Better menu structure: The documentation is now accessible from the Help menu, ...
-			o Keyaccelerators for each display window type
-			o much more
-		- General Book Support (GBS): Books like "Josephus" are supported now.
-			Operations like bookmarking, printing, copying or saving work just like with
-			Bibles, commentaries or lexicons.
-		- Crossreference support
-			Crossreferences work now. For example you can click now on a strong number to open the
-			module for it which displayes the chosen number. The same for Bibles, morph tags etc.
-			Tooltips work for the links, too.
-		- Improved Unicode support
-			Unicode encoded modules are now supported in a better way. Choosing the font and
-			the displaying of the text works better. RTL support and better rendering is still
-			missing.
-		- Profile management. Profiles capture the current state of the working area
-			(opened display windows, scrollbar positions, set keys ...). Profiles can be loaded to
-			restore the old state and can be saved to store the current state for later. Automatically
-			restoring the windows after startup is possible, too.
-		- Better crash management. BibleTime tries now to save settings if a crash occured. Although we
-			implemented this, we don't know how to make BibleTime crash ;) It's just for your safety.
-		- Speed improvements. Printing is almost two times faster now. Searching in modules is also faster,
-			but this was improved in the Sword library by the Sword developers.
-		- Improved display windows. Independent display settings for each window (footnotes, strongs ...)
-		- Fullscreen mode of the main application window
-		- Improved commentary editor: Ask if the text should be saved if the window or BibleTime should be closed
-			if the changed text was not saved before.
-		
-2001-11-24 Fred Saalbach <saalbach@sybercom.net>
-	* Moved documentation to bibletime-docs - includes .po files, handbook, etc.
-	* This will reduce the size of the main program and allow more flexibility
-	  for the creation of RPM's.
-	* Compile time for the main program will also be reduced.
-
-2001-09-22 Fred Saalbach <saalbach@sybercom.net>
-	* Fixed problem with sgml tag <graphic> by replacing it with the <InLineMediaObject> in the english handbook.
-	* This only is a problem with systems running kde 2 and document
-	* text descripter  "-//KDE//DTD DocBook V3.1-Based Variant V1.0//EN"
-	* kdb2html finishes without errors now.
-
-2001-08-30 Joachim Ansorg <jansorg@gmx.de>
-	* Added $(DESTDIR) to Makefile.am files
-	* Solved compilation errors
-
-2001-08-17 Joachim Ansorg <jansorg@gmx.de>
-	* Optimizations to CSwordBibleModuleInfo
-	* Fixed bug in CBibleKeyChooser
-	* New structure in the optionsdialog
-	* Key accelerators for each display window type
-	* Fullscreen button
-
-2001-07-28 Joachim Ansorg <jansorg@gmx.de>
-	* The new configure options are cached now (sword lib,includes, distribution name and version, RPM prefix and group)
-
-2001-07-27 Joachim Ansorg <jansorg@gmx.de>
-	* Added history box in the HTML dialog widget if history browsing is enabled
-
-2001-07-16 Joachim Ansorg <jansorg@gmx.de>
-	* Implemented better configure script. We have now options to link to a static Sword library!
-	* Added rudimentary support for version checking
-
-2001-06-20 Joachim Ansorg <jansorg@gmx.de>
-	* Release BibleTime 1.0!
-	We're really glad we got it out now! Enjoy!
-	Sorry for the large delay!
-
-2001-03-08 Joachim Ansorg <jansorg@gmx.de>
-	* Released BibleTime 1.0beta1.
-
-2001-02-17 Joachim Ansorg <jansorg@gmx.de>
-	* Added QTextEdit, QTextView, and QRichText classes from Qt3 (ported by David Faure)
-	* Removed the Qt2 classes QTextView, QTextBrowser and the class KTextEdit
-
-2001-02-13 Joachim Ansorg <jansorg@gmx.de>
-	* Changed the direction of the spin boxes
-		and of the scrollbutton in the presenters
-	* Updated QWorkspace to the one of Qt 2.2.4
-	
-2001-02-07 Joachim Ansorg <jansorg@gmx.de>
-	* Fixed bugs in the groupmanager, searchdialog and presenters
-
-2001-02-04 Joachim Ansorg <jansorg@gmx.de>
-	* Added new features:
-			RMB menus in the presenters and in the searchdialog
-
-2001-02-03 Joachim Ansorg <jansorg@gmx.de>
-	* Added Makefile system to create and install the handbook
-	* Fred added his really nice handbook in .docbook format	
-	* Improved printing dialog: Now the styles are saved and restored correctly, needs some tweaking
-	*	Fixed some bugs in the printing system, removed the range specifiers of the printing dialog
-
-2001-02-02 Joachim Ansorg <jansorg@gmx.de>
-	* Fixed some bug in CTipWindow
-	* Fixed some bugs in our copy of QTextView
-	* Fixed some bug in CStyleEditorDialog
-	* Fixed some bug in the printing system
-	* Improved CBiblePresenter and CPrinterDialog
-	
-2001-01-30 Joachim Ansorg <jansorg@gmx.de>
-	* Updated ToDo
-	
-2001-01-27 Joachim Ansorg <jansorg@gmx.de>
-	* Fixed the graphical search analysis, it should now work 99%
-
-2001-01-21 Joachim Ansorg <jansorg@gmx.de>
-	* Improved the style editor
-
-2001-01-19 Joachim Ansorg <jansorg@gmx.de>
-	* Improved the search anaylsis a little bit
-
-2001-01-18 Joachim Ansorg <jansorg@gmx.de>
-	* Fixed some bugs in the searchdialog
-	* The bug with indexed modules and first search is now fixed,
-	  it was an error in Sword
-	* Fixed some nasty bugs in the Sword backend
-	* Marking searched words in the key text for multiple words works now 100%
-	* The last book is now shown in the graphical search analysis
-
-2001-01-18 Joachim Ansorg <jansorg@gmx.de>
-	* Changed icon names and updated icon directories
-	* Included all icons we need
-	* Improved the BibleTime icons
-
-2001-01-01 Joachim Ansorg <jansorg@gmx.de>
-	
-	A BLESSED NEW YEAR!
-	
-	-Added the command line option --debug to enable debug messages
-2000-12-29 Joachim Ansorg <jansorg@gmx.de>
-	*Changed behaviour if a book, chapter or verse was changed in the Bible-keychooser
-	
-
-2000-12-29 Joachim Ansorg <jansorg@gmx.de>
-	* Changed iconname so it will be found
-
-2000-12-26 Joachim Ansorg <jansorg@gmx.de>
-	* Improved printing support (correct handling of singals ...)
-
-2000-12-22 Joachim Ansorg <jansorg@gmx.de>
-	* Fixed a bug in CGroupmanager: BibleTime does now start without installed modules!
-
-2000-12-19 Joachim Ansorg <jansorg@gmx.de>
-	* Some work on the oresenters and keychoosers
-	* Fixed a small bug in cprintitemlist.cpp
-
-2000-12-16 Joachim Ansorg <jansorg@gmx.de>
-	* Fixed the crash in ctipwindow.cpp
-
-2000-12-08 Joachim Ansorg <jansorg@gmx.de>
-	* Fixed some printing bugs
-	* Added QWorkspace of Qt 2.2.2 to our sources, so everybody has the fixed QWorkspace version
-
-2000-12-05 Jochim Ansorg <jansorg@gmx.de>~
-	* Drag& Drop on presenters works again
-	* Finished "context sensitive" presenter refreshing
-
-2000-12-04 Jochim Ansorg <jansorg@gmx.de>
-	* Fixed this nasty "Default verse color" bug (was a wrong placed readEntry instead of readColorEntry in bibletime.cpp)
-	* Fixed unifont support, it works no with non-ISO-8859-1 languages and fonts
-
-2000-12-03 Jochim Ansorg <jansorg@gmx.de>
-	* Changed the latin1() calls of QString to (const char*) ... local8Bit()
-	* Changed QTextView a little bit: Do not set contents pos to 0,0 in QTexView::setText(), the result is a fester displaying of the texts
-	* Changed the optionsdialog to display the language name and not the abbrevation	
-
-2000-11-28	Joachim Ansorg <jansorg@gmx.de>
-	*  You can now switch between different book translations on runtime!
-	* Improved "context sensitive" presenter refresh (e.g. if footnotes are enabled only presenters with modules having them will be refreshed)
-	* Fixed some memory leaks.
-	
-2000-11-04	Joachim Ansorg <jansorg@gmx.de>
-	* Solved some bugs
-	* Updated ceditwidget.cpp so saving HTML is correct, loading is still incomplete
-	* Made te frontend a shared lib and moved sources which should be there into frontend
-		libfrontend is now called libbibletime_frontend.la.
-	* Made --enable-shared the default options (changed to configure.in.in)
-
-2000-10-30	Joachim Ansorg <jansorg@gmx.de>
-	* Added sources and headers of QTextView, QTextBrowser and QRichText
-	* Added signal wordHighlighted in QTextView
-	
-2000-10-29	Joachim Ansorg <jansorg@gmx.de>
-	* Removed the toggle toolbar/footnotes/strongs bugs
-	* Removed the bug Troy found (deletion of the searchresult)
-
-2000-10-24	Joachim Ansorg <jansorg@gmx.de>
-	* Removed the old backend and introduced a new, better faster
-		backend with a new backend
-	* Fixed some GUI bugs (ported from 0.3)
-	* Fixed some backend bugs, removed CSwordVerseKey operators
-	* Added portuguese translation of 0.3's messages, but it's still
-		useable for 1.0CVS
-
---Lots of time passed by
-
-2000-07-24 	Joachim Ansorg <jansorg@gmx.de>
-	*Released 0.3! A really long time! We hope you like it!
-
----Changelog will be continued after final 0.3
-
-1999-12-30 	Joachim Ansorg <Jockel123@gmx.de>
-	*We should be now ready for 0.22 ;-)
-
-1999-12-26 	Joachim Ansorg <Jockel123@gmx.de>
-	*Removed the commented out #includes
-	*Updated AUTHORS file
-
-1999-12-25 	Joachim Ansorg <Jockel123@gmx.de>
-	*make now use of getFontList (in global.h) to get the fonts
-	*Added some ASSERT
-	*Check it objects are zero in fontmanagement dialog
-
-1999-12-24 	Joachim Ansorg <Jockel123@gmx.de>
-	*BibleTime 0.21 - I hope it's a nice Christmas present  ;-)
-
-1999-12-23 	Joachim Ansorg <Jockel123@gmx.de>
-	*Changed some icons in CEditWidget to newer names
-
-1999-12-22 	Birger Langkjer <birger.langkjer@image.dk>
-	*Updated danish translation
-	*Added bibletime/optionsdialog/Makefile.in because this prevented me from compiling the first time.
-
-1999-12-21 	Joachim Ansorg <Jockel123@gmx.de>
-	*The searchresult tab is now disabled if the list is empty
-	*The moduletree-tabs are disable if the correspondig trees are empty
-
-1999-12-20 	Joachim Ansorg <Jockel123@gmx.de>
-	*The fontmanagement dialog is now grayed out if there's no entry in the list
-	
-1999-12-20 	Birger Langkjer <birger.langkjer@image.dk>
-	*Updated danish translation
-
-1999-12-19 	Joachim Ansorg <Jockel123@gmx.de>
-	*Fontmanagementdialog uses now a XFonts list, not the list provided by KDE. This solves the problems on
-	systems without KFontManager
-	*Added files global.h and global.cpp which should contain global functions
-	*Fixed some typos in the german translation
-	
-1999-12-18 	Joachim Ansorg <Jockel123@gmx.de>
-	*Added Apply-Button in the optionsdialog
-	
-1999-12-17 	Joachim Ansorg <Jockel123@gmx.de>
-	*Tried to fix the charset problem in ktipoftheday.cpp
-	*Updated AUTHORS list	
-
-1999-12-16 	Joachim Ansorg <Jockel123@gmx.de>
-	*Updated Michal's Czech translation
-
-1999-12-15 	Joachim Ansorg <Jockel123@gmx.de>
-	*Added Czech language file: Thanks to Michal Rovnan� <Michal.Rovnanik@seznam.cz>
-
-1999-12-12 	Joachim Ansorg <Jockel123@gmx.de>
-	*Removed function CNotesEditor::isTextSelected()
-	*Added possibility to select type of highlighting of text for the notes editor
-	*Added load and save of current highlighting type
-
-1999-12-04 	Joachim Ansorg <Jockel123@gmx.de>
-	*Convrted the bmp images to jpg
-	*Bibletime uses now kimgio everywhere
-	*Added danish translation
-
-1999-11-27 	Joachim Ansorg <Jockel123@gmx.de>
-	*Removed unused images
-	*BibleTime 0.2
-	
-1999-11-26 	Joachim Ansorg <Jockel123@gmx.de>
-	*Finished the whole german handbook
-	*Removed the own filters (plainhtml, rwphtml and gbfhtml),use (newer) filters of SWORD version
-	*You can now select the entries in the bookmark-manager with the upper and lower keys and activate them with RETURN
-
-1999-11-25 	Joachim Ansorg <Jockel123@gmx.de>
-	*Updated ToDo and Readme
-	*Caption of mainwindow now contains the current chapter and verse
-	
-1999-11-24 	Joachim Ansorg <Jockel123@gmx.de>
-	*Made some labels in the printer-optionsdialog bigger to fit french translation
-	*ResizeEvent in SearchScopeDialog
-
-1999-11-20 	Joachim Ansorg <Jockel123@gmx.de>
-  *Startuplogo is now a PNG, this makes the distribution smaller
-	*To make this work make use of kimgio
-
-1999-11-18 	Joachim Ansorg <Jockel123@gmx.de>
-	*Finished my part on german handbook
-
-1999-11-16 	Joachim Ansorg <Jockel123@gmx.de>
-	*Worked on translation of handbook to german
-	*Translated some tips in german tipdatabase
-
-1999-11-14 	Joachim Ansorg <Jockel123@gmx.de>
-	*The searchbuttons and the three radiobuttons are now resized
-
-1999-11-12 	Joachim Ansorg <Jockel123@gmx.de>
-	*Fixed Bug: Now you can paste into the loojupline
-
-1999-11-10 	Joachim Ansorg <Jockel123@gmx.de>
-	*Fixed bug in CDocBrowser on non KDE 1.1.2 systems
-
-1999-11-07 Joachim Ansorg <Jockel123@gmx.de>
-	*Tidied up kwrite - removed lots of commented code
-
-1999-11-03 	Joachim Ansorg <Jockel123@gmx.de>
-	*Updated authors list
-	*Thorsten added the new printer dialog - it works now
-	
-1999-11-03 	Joachim Ansorg <Jockel123@gmx.de>
-	*Added optimized paint function committed in the KDevelop mailing list by Vladimir Dvorak
-	 Thanks Vladimir!
-	*Readded the nl.po file - it was lost by some reason
-
-1999-11-01 	Joachim Ansorg <Jockel123@gmx.de>
-	*Updated handbook - Jeff's work is really great!
-	*You can now use more than 31 tips in a tipdatabase
-	
-1999-10-23 	Joachim Ansorg <Jockel123@gmx.de>
-	*Renamed members in BibleTimeView: tTabView to treeTabView and sTabView to browserTabView
-	 We need this because sTabView and tTabView are confusing
-	*Changed CChartWidget to resize the different graphs to the height of the window
-	*Changed topPanner to leftPanner in BibleTimeView - this is a better name
-	*Updated API documentation
-	*Fixed BUG: Now the recentText part in BibleTimeView is saved correctly again
-	*Noticed that KDE 1.1.2 has the calcScrollBars bug solved, no we use only our own function in KDE version before 1.1.2
-	
-1999-10-21 	Joachim Ansorg <Jockel123@gmx.de>
-	*Bugfix: Key acelelerators are now saved after changing and restored on new startup
-	*Updated API documentation
-	*Updated ktipofday.cpp and ktipofday.h from KDevelop to compile with GCC 2.95
-
-1999-10-19 	Joachim Ansorg <Jockel123@gmx.de>
-	*Fixed a bug in CDocBrowser: If you lookup some text, the module wasn't highlighted
-	*Added own submenu for the lookup part in CDocBrowser
-	
-1999-10-18 	Joachim Ansorg <Jockel123@gmx.de>
-	*BibleTime needs now the upcoming SWORD 1.45
-
-1999-10-17 	Joachim Ansorg <Jockel123@gmx.de>
-	*Fixed bug: standard accelerators are now really disabled
-
-1999-10-16 	Joachim Ansorg <Jockel123@gmx.de>
-	*Added Jeff to AUTHORS
-	*Updated german translation
-
-1999-10-15 	Joachim Ansorg <Jockel123@gmx.de>
-	*Solved a bug in the linkmanager: If you open the dialog and click OK the existing items were deleted
-	*Added a script to put all i18n() things into the translation template. It called make-messages.sh. It's on the topdir.
-	*Commented out the first lines of BibleTimeMgr to get BibleTime to compile without modifications of SWORD.
-	 Please uncomment these lines to make use of the PLAINFootnotes option filter. Make the declarations in the header
-	 file to protected on which the compiler complains about.
-	
-1999-10-14 	Joachim Ansorg <Jockel123@gmx.de>
-	*Implemented context sensitive enabling and disabling of the edit menu entries
-	*Updated KWrite sourcen to the newest one shipped with KDevelop
-	*Added Class CKNewAccel - provides disabling and enabling of accels by reeourceentry like ID_FILE_PRINT
-	
-1999-10-13 	Joachim Ansorg <Jockel123@gmx.de>
-	*Added refreshing of the list in CDocBrowser
-	*BibleTime does not load an empty HTML file
-	 (e.g. when you load a file via a HREf module and the server is unknown -> KFM returns an empty file)
-	*Improved a little bit the internet support
-	
-1999-10-12 	Joachim Ansorg <Jockel123@gmx.de>
-	*Implemented functions in linkmanager. Implemented the link management in CDocBrowser::showURL.
-	 Needs some work: We have to decide if the file is local or remote and downloda it first
- 	 or we put a new option in the dialog.
-
-1999-10-10 	Joachim Ansorg <Jockel123@gmx.de>
-	*Added new german index.sgml
-	*Updated icons. You can now recpgnize what the icons mean
-	*Added BibleTimeDoc::slotMoveToPreviousVerse() and BibleTimeDoc::slotMoveToNextVerse()
-	 Changed BibleTimeApp uses these functions to jump to the previous / next verse
-	 Added needed pixmaps and keyaccels
-
-1999-10-09 	Joachim Ansorg <Jockel123@gmx.de>
-	*Worked on the handbook
-	*Added Quickhelp for the widgets in the link management dialog.
-
-1999-10-08 	Joachim Ansorg <Jockel123@gmx.de>
-	*Added some text to the handbook
-	*Removed the german index.sgml file, because it makes no senss.
-	 We will add this if the english one is ready to translate it into german.
-	*Cleaned up KListView::addChildItem()
-	*Finished dialog of the link manager, needs implementation of functions to work
-
-1999-10-05 	Joachim Ansorg <Jockel123@gmx.de>
-	*Added -lz to bibletime/Makefile.am to avoid compilation problems on RedHat 5.2 systems
-	*Added some needed icons and changed iconnames in the sourcecode
-	*Solved some spelling errors in the CBugReportDlg	and changed some kdevelop to bibletime in the class
-	*Now you can't print by pressing STRG+P if printing is disabled
-
-1999-10-03 	Joachim Ansorg <Jockel123@gmx.de>
-	*Changed CForeignFontOptions: The fonts are now saved in function saveSettings(), not after changing the font
-	*Changed OptionsDialog:	The different options are displayed in a tree.
-	*Removed old OptionsDialog
-	*Created new subdirectory optionsdialog. We will need it for later development
-
-1999-10-01 	Joachim Ansorg <Jockel123@gmx.de>
-	*Changed some QColor (QRGB ...) to (QColor) (QRGB ...) to solve compilation problems on Debian.
-
-1999-09-29	Joachim Ansorg <Jockel123@gmx.de>
-	*font auto-switching works now
-	*Changed the line to edit the fontname to a combobox
-
-1999-09-29	Joachim Ansorg <Jockel123@gmx.de>
-	*Implemented more features of font-auto-switching, needs still work
-	
-1999-09-28	Joachim Ansorg <Jockel123@gmx.de>
-	*Implemented simple switching between fonts - will work on it
-	*Implemented signal BibleTimeDoc::sigSetBibleFont(const QString)
-	 Implemented slot BibleTimeView::slotSetBibleFont(const QString)
-	 These signal and the slot will be used in the near future for switching of fonts.
-	*Connected the signal and the slot in BibleTimeApp::initView
-	
-1999-09-25	Joachim Ansorg <Jockel123@gmx.de>
-	*On print the printerdialog is shown before the QT-dilaog. But printing
-	 doesn't work at the moment.
-	 We have to implement the slot slotPrint() of CPrinterDialog to make it work.
-	*Changes in cnoteseditor.cpp the #define BUTTON_BAR_HEIGHT to an abosolut value.
-	 Solves a problem with the height of the editor.
-  *Updated the startuplogo. It's now much more nice as the previous version.
-  *Integrated the startuplogo in the aboutdialog. It's now displayed in the upper left corner of the box.
-  *The class KStartupLogo looks now for the size of the startuplogo and resize the widget in the right way if the size have changed.
-  *CDocBrowserColor: Made some hardcoded texts to i18n("")
-  	 	
-1999-09-19	Joachim Ansorg <Jockel123@gmx.de>
-	*Reorganized the icons:
-	 There are now two directories: pics and toolbar. pics contains the directory mini/
-	 which contains the mini icons. Mini icons are named with a trailing mini-.
-	 The directory toolbar contains the icons which are only used in the toolbar.
-	 This should be the new standard we use.
-	
-1999-09-19	Joachim Ansorg <Jockel123@gmx.de>
-	*Changed names and install paths of some icon
-	*Added some needed icons we forgot
-	*Added function BibleTimeApp::slotHelpContents(): calls the online help
-	*Solved: Changes of the key accelerators doesn't change the
-	 accels in the menus
-	*rendered Footnotes are now displayed in dark red, too
-  *Cleaned up DCocBrowser
-	
-1999-09-18	Joachim Ansorg <Jockel123@gmx.de>	
-	*Optimized a little bit the paintText function of CChartWidget
-	
-1999-09-17	Joachim Ansorg <Jockel123@gmx.de>
-	*Changed a little bit the GBFHTML filter:
-	 Anotations are now displayed in dark red
-	*Decided to use use the PLAINHTML filter as standard
-	 If no filter is specified in the .conf file of the module we use
-	 now the PLAINHTML filter. Perhaps we need to change this
-
-1999-09-16	Joachim Ansorg <Jockel123@gmx.de>
-	*Fixed this stupid bug related to the crash while searching the web bible
-
-1999-09-14	Joachim Ansorg <Jockel123@gmx.de>
-	*Change the GBFHTML filter a little bit
-	 It displays now the word explained in a footnote formatted as bold
-	
-1999-09-14	Joachim Ansorg <Jockel123@gmx.de>
-	*Updated program version to 0.2
-	
-1999-09-12	Joachim Ansorg <Jockel123@gmx.de>
-	*Added some tips to the tipdatabase
-	*Added class KStartupLogo to display a picture on startup
-	
-1999-09-10	Joachim Ansorg <Jockel123@gmx.de>
-	*Rewrite of the Searchanalysis, it's now up to 63 times faster
-	*Text in the CChartWidget is now painted rotated (90)
-	
-1999-09-05	Joachim Ansorg <Jockel123@gmx.de>
-	*Added analysis of searchresults -> needs still some work
-	*updated de.po translation errors
-	*updated homepage
-	
-1999-09-04	Joachim Ansorg <Jockel123@gmx.de>
-	*created sub folders: gfx and printing
-	*Added CPrinterDialog of KHexedit 0.81 -> isn't used at the moment
-	
-1999-09-02	Joachim Ansorg <Jockel123@gmx.de>
-	*Added classes for searchanalysis and a ChartWidget
-  *Updated configure.in - it checks now for headers and the SWORD lib in two steps
-	
-1999-08-30	Joachim Ansorg <Jockel123@gmx.de>
-	*Changed and corrected some GUI errors
-
-1999-08-29	Joachim Ansorg <Jockel123@gmx.de>
-	*Decided to update this Changelog frequently
-	*Changed the notesEditor to a non-tabbar look
-	*New class CNotesEditor
-
-1999-08-27	Joachim Ansorg <Jockel123@gmx.de>
-	*First public release of BibleTime: Version 0.1
-
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index 7596a0a..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,228 +0,0 @@
-Additions for BibleTime 1.4.1:
----------------------------
-
-These are instructions how to install BibleTime 1.4.1.
-It's sometimes a little bit tricky to get Bibletime and SWORD working, but
-it's possible.
-
-BibleTime 1.4.1 requires:
-	-KDE  >= 3.0 (at least the libraries (kdelibs) and the base package (kdebase))
-	-SWORD 1.5.7
-	-CURL >= 7.10
-
-If you don't have the sources already please browse to www.bibletime.info to see
-a list of required packages with their download URLs.
-
-Text Modules are available from http://www.crosswire.org, which has good
-directions regarding their installation.  Install text modules after Sword
-and BibleTime.
-
-Complete instructions for the installation of BibleTime, supporting programs,
-and text modules can be found in the project documentation
-at http://www.bibletime.info/documentation.
-
-
-Compile BibleTime 1.4.1:
----------------------------
-cd ~/bibletime				#move to your source directory
-kde-config --prefix			#Finds your kde directory (optional)
-
-export QTDIR=<QT source directory>
-export KDEDIR=<KDE directory (where KDE is installed)>
-export PATH=$KDEDIR/bin:$PATH
-./configure		--prefix=<your KDE dir>  # create makefiles
-make			# compile BibleTime
-su					# change to "root user"
-make install	# install BibleTime
-
-
----------------------------
-	useful make options
----------------------------
-make clean				# Removes binaries from the directory
-					        # where BibleTime was compiled, but not the source
-make uninstall		# Removes BibleTime from your system
-
-
-
-If something is missing in this file please post to joachim@ansorgs.de, my peronal
-eMail adress.
-Please read README for a short description of BibleTime 1.4.1. The new handbook
-does contain better instructions how to install BibleTime from sources.
-It has more information about BibleTime's features and installation.
-
-The BibleTime team <info@bibletime.info>
-
-
-______________________________________________________________________________
-**			The standard Installation instructions of auto-tool packages				**
-------------------------------------------------------------------------------
-
-
-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, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   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 at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' 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 a while.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Type `make install' to install the programs and any data files and
-     documentation.
-
-  4. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `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:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-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 supports 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=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   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' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-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 host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-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.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-
diff --git a/INSTALL.in b/INSTALL.in
deleted file mode 100644
index 21c25ac..0000000
--- a/INSTALL.in
+++ /dev/null
@@ -1,228 +0,0 @@
-Additions for BibleTime @VERSION@:
----------------------------
-
-These are instructions how to install BibleTime @VERSION@.
-It's sometimes a little bit tricky to get Bibletime and SWORD working, but
-it's possible.
-
-BibleTime @VERSION@ requires:
-	-KDE  >= 3.0 (at least the libraries (kdelibs) and the base package (kdebase))
-	-SWORD 1.5.7
-	-CURL >= 7.10
-
-If you don't have the sources already please browse to www.bibletime.info to see
-a list of required packages with their download URLs.
-
-Text Modules are available from http://www.crosswire.org, which has good
-directions regarding their installation.  Install text modules after Sword
-and BibleTime.
-
-Complete instructions for the installation of BibleTime, supporting programs,
-and text modules can be found in the project documentation
-at http://www.bibletime.info/documentation.
-
-
-Compile BibleTime @VERSION@:
----------------------------
-cd ~/bibletime				#move to your source directory
-kde-config --prefix			#Finds your kde directory (optional)
-
-export QTDIR=<QT source directory>
-export KDEDIR=<KDE directory (where KDE is installed)>
-export PATH=$KDEDIR/bin:$PATH
-./configure		--prefix=<your KDE dir>  # create makefiles
-make			# compile BibleTime
-su					# change to "root user"
-make install	# install BibleTime
-
-
----------------------------
-	useful make options
----------------------------
-make clean				# Removes binaries from the directory
-					        # where BibleTime was compiled, but not the source
-make uninstall		# Removes BibleTime from your system
-
-
-
-If something is missing in this file please post to joachim@ansorgs.de, my peronal
-eMail adress.
-Please read README for a short description of BibleTime @VERSION@. The new handbook
-does contain better instructions how to install BibleTime from sources.
-It has more information about BibleTime's features and installation.
-
-The BibleTime team <info@bibletime.info>
-
-
-______________________________________________________________________________
-**			The standard Installation instructions of auto-tool packages				**
-------------------------------------------------------------------------------
-
-
-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, a file
-`config.cache' that saves the results of its tests to speed up
-reconfiguring, and a file `config.log' containing compiler output
-(useful mainly for debugging `configure').
-
-   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 at some point `config.cache'
-contains results you don't want to keep, you may remove or edit it.
-
-   The file `configure.in' is used to create `configure' by a program
-called `autoconf'.  You only need `configure.in' 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 a while.  While running, it prints some
-     messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Type `make install' to install the programs and any data files and
-     documentation.
-
-  4. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  
-
-Compilers and Options
-=====================
-
-   Some systems require unusual options for compilation or linking that
-the `configure' script does not know about.  You can give `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:
-     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-
-Or on systems that have the `env' program, you can do it like this:
-     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-
-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 supports 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=PATH'.
-
-   You can specify separate installation prefixes for
-architecture-specific files and architecture-independent files.  If you
-give `configure' the option `--exec-prefix=PATH', the package will use
-PATH as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
-
-   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' can not figure out
-automatically, but needs to determine by the type of host the package
-will run on.  Usually `configure' can figure that out, but if it prints
-a message saying it can not guess the host type, give it the
-`--host=TYPE' option.  TYPE can either be a short name for the system
-type, such as `sun4', or a canonical name with three fields:
-     CPU-COMPANY-SYSTEM
-
-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 host type.
-
-   If you are building compiler tools for cross-compiling, you can also
-use the `--target=TYPE' option to select the type of system they will
-produce code for and the `--build=TYPE' option to select the type of
-system on which you are compiling the package.
-
-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.
-
-Operation Controls
-==================
-
-   `configure' recognizes the following options to control how it
-operates.
-
-`--cache-file=FILE'
-     Use and save the results of the tests in FILE instead of
-     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
-     debugging `configure'.
-
-`--help'
-     Print a summary of the options to `configure', and exit.
-
-`--quiet'
-`--silent'
-`-q'
-     Do not print messages saying which checks are being made.
-
-`--srcdir=DIR'
-     Look for the package's source code in directory DIR.  Usually
-     `configure' can determine that directory automatically.
-
-`--version'
-     Print the version of Autoconf used to generate the `configure'
-     script, and exit.
-
-`configure' also accepts some other, not widely useful, options.
-
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 184b725..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,77 +0,0 @@
-SUBDIRS = bibletime pot docs .
-
-EXTRA_DIST = \
-bibletime.kdevprj \
-COPYING \
-ChangeLog \
-bibletime.spec.in bibletime.spec \
-README.in README \
-INSTALL.in INSTALL\
-bibletime.lsm.in bibletime.lsm \
-configure.in.in configure.in \
-bibletime.desktop.in bibletime.desktop \
-NEWS.in NEWS \
-Makefile.cvs autogen.sh \
-bibletime.m4 sword.m4
-
-btadmindir = $(top_srcdir)/admin
-
-# EXTRA_DIST += $(btadmindir)/ChangeLog
-EXTRA_DIST += $(btadmindir)/compile
-EXTRA_DIST += $(btadmindir)/config.guess
-EXTRA_DIST += $(btadmindir)/config.pl
-EXTRA_DIST += $(btadmindir)/config.sub
-EXTRA_DIST += $(btadmindir)/configure.in.bot.end
-EXTRA_DIST += $(btadmindir)/configure.in.min
-EXTRA_DIST += $(btadmindir)/cvs-clean.pl
-EXTRA_DIST += $(btadmindir)/install-sh
-EXTRA_DIST += $(btadmindir)/ltmain.sh
-EXTRA_DIST += $(btadmindir)/missing
-EXTRA_DIST += $(btadmindir)/mkinstalldirs
-EXTRA_DIST += $(btadmindir)/ylwrap
-EXTRA_DIST += $(btadmindir)/Makefile.common
-EXTRA_DIST += $(btadmindir)/acinclude.m4.in
-EXTRA_DIST += $(btadmindir)/am_edit
-EXTRA_DIST += $(btadmindir)/conf.change.pl
-EXTRA_DIST += $(btadmindir)/debianrules
-EXTRA_DIST += $(btadmindir)/depcomp
-EXTRA_DIST += $(btadmindir)/detect-autoconf.sh
-EXTRA_DIST += $(btadmindir)/libtool.m4.in
-EXTRA_DIST += $(btadmindir)/nmcheck
-EXTRA_DIST += $(btadmindir)/cvs.sh
-
-include debian/Makefile.am
-
-# not a GNU package. You can remove this line, if 
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = 1.6 foreign dist-bzip2
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in sword.m4 bibletime.m4
-	@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in sword.m4 bibletime.m4 > acinclude.m4
-$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(shell test -f $(top_srcdir)/configure.files && cat $(top_srcdir)/configure.files)
-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in
-$(top_srcdir)/subdirs:
-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
-$(top_srcdir)/configure.files:
-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
-
-install-data-local:
-	chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R
-	$(mkinstalldirs) $(kde_appsdir)/Applications
-	$(INSTALL_DATA) $(srcdir)/bibletime.desktop $(kde_appsdir)/Applications/bibletime.desktop
-
-uninstall-local:
-	-rm -f $(kde_appsdir)/Applications/bibletime.desktop
-
-MAINTAINERCLEANFILES = configure.files subdirs 
-
-dist-hook:	
-	rm -f $(distdir)/bibletime-*.tar.gz $(distdir)/bibletime-*.tar.bz2
-	rm -rf `find $(distdir) -name tags -o -name TAGS -o -name \*.xcf`
-#	rm -f $(distdir)/admin/Changelog $(distdir)/make-messages.sh \
-#		$(distdir)/extractrc $(distdir)/preparetips \
-#		$(distdir)/bibletime.doxygen $(distdir)/bibletime.kdevses \
-#		$(distdir)/bibletime.start $(distdir)/configure.files \
-#		$(distdir)/bibletime/pics/gen_am.sh
-	rm -rf $(distdir)/autom4te.cache
-
diff --git a/Makefile.cvs b/Makefile.cvs
deleted file mode 100644
index 2444ea1..0000000
--- a/Makefile.cvs
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Makefile for the cvs repository of BibleTime
-# Modified by Martin Gruner
-#
-# Copyright: (c) 2000 The BibleTime team.
-#
-
-all:
-	@echo "This Makefile is only for the CVS repository"
-	@echo "This will be deleted before making the distribution"
-	@echo ""
-	$(MAKE) -f admin/Makefile.common cvs
-
-.SILENT:
diff --git a/Makefile.in b/Makefile.in
deleted file mode 100644
index 8decb16..0000000
--- a/Makefile.in
+++ /dev/null
@@ -1,852 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-SUBDIRS = bibletime pot docs .
-
-
-# EXTRA_DIST += $(btadmindir)/ChangeLog
-EXTRA_DIST = \
-bibletime.kdevprj \
-COPYING \
-ChangeLog \
-bibletime.spec.in bibletime.spec \
-README.in README \
-INSTALL.in INSTALL\
-bibletime.lsm.in bibletime.lsm \
-configure.in.in configure.in \
-bibletime.desktop.in bibletime.desktop \
-NEWS.in NEWS \
-Makefile.cvs autogen.sh \
-bibletime.m4 sword.m4\
-$(btadmindir)/compile $(btadmindir)/config.guess $(btadmindir)/config.pl $(btadmindir)/config.sub $(btadmindir)/configure.in.bot.end $(btadmindir)/configure.in.min $(btadmindir)/cvs-clean.pl $(btadmindir)/install-sh $(btadmindir)/ltmain.sh $(btadmindir)/missing $(btadmindir)/mkinstalldirs $(btadmindir)/ylwrap $(btadmindir)/Makefile.common $(btadmindir)/acinclude.m4.in $(btadmindir)/am_edit $(btadmindir)/conf.change.pl $(btadmindir)/debianrules $(btadmindir)/depcomp $(btadmindir)/detect-autoconf.sh $(btadmindir)/libtool.m4.in $(btadmindir)/nmcheck $(btadmindir)/cvs.sh $(btdebdir)/bibletime.xpm $(btdebdir)/changelog $(btdebdir)/control $(btdebdir)/copyright $(btdebdir)/dirs $(btdebdir)/docs $(btdebdir)/menu $(btdebdir)/override $(btdebdir)/rules
-
-btadmindir = $(top_srcdir)/admin
-btdebdir = $(top_srcdir)/debian
-
-# not a GNU package. You can remove this line, if 
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = 1.6 foreign dist-bzip2
-
-MAINTAINERCLEANFILES = configure.files subdirs 
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = NEWS README INSTALL bibletime.lsm bibletime.spec \
-	bibletime.desktop
-DIST_SOURCES =
-
-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
-#>- 	all-recursive install-data-recursive install-exec-recursive \
-#>- 	installdirs-recursive install-recursive uninstall-recursive \
-#>- 	check-recursive installcheck-recursive
-#>+ 5
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
-DIST_COMMON = $(srcdir)/debian/Makefile.am COPYING ChangeLog INSTALL.in \
-	Makefile.am Makefile.in NEWS.in README.in acinclude.m4 \
-	aclocal.m4 admin/compile admin/config.guess admin/config.sub \
-	admin/depcomp admin/install-sh admin/ltmain.sh admin/missing \
-	admin/mkinstalldirs admin/ylwrap bibletime.desktop.in \
-	bibletime.lsm.in bibletime.spec.in config.h.in configure \
-	configure.in
-DIST_SUBDIRS = $(SUBDIRS)
-#>- all: config.h
-#>+ 1
-all: docs-am  config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(srcdir)/debian/Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --foreign  Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-	cd $(top_srcdir) && perl admin/am_edit Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-
-$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-#>- 	cd $(srcdir) && $(AUTOCONF)
-#>+ 2
-	cd $(srcdir) && rm -f configure
-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	touch $(srcdir)/config.h.in
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-NEWS: $(top_builddir)/config.status NEWS.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-README: $(top_builddir)/config.status README.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-INSTALL: $(top_builddir)/config.status INSTALL.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-bibletime.lsm: $(top_builddir)/config.status bibletime.lsm.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-bibletime.spec: $(top_builddir)/config.status bibletime.spec.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-bibletime.desktop: $(top_builddir)/config.status bibletime.desktop.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-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.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (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.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	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; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	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
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if (etags --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	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)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS: ctags-recursive $(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; }'`; \
-	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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = .
-distdir = $(PACKAGE)-$(VERSION)
-
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkinstalldirs) $(distdir)/$(btadmindir) $(distdir)/$(btdebdir) $(distdir)/. $(distdir)/./debian $(distdir)/admin
-	@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"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(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
-	$(am__remove_distdir)
-	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
-	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 ../.. && $(mkinstalldirs) "$$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-gzip \
-	  && rm -f $(distdir).tar.gz \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@echo "$(distdir).tar.gz is ready for distribution" | \
-	  sed 'h;s/./=/g;p;x;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
-all-am: Makefile config.h
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip distcheck \
-	distclean distclean-generic distclean-hdr distclean-libtool \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-data install-data-am \
-	install-data-local install-data-recursive install-exec \
-	install-exec-am install-exec-recursive install-info \
-	install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-local uninstall-recursive
-
-
-$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in sword.m4 bibletime.m4
-	@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in sword.m4 bibletime.m4 > acinclude.m4
-$(top_srcdir)/configure.in: $(top_srcdir)/configure.files $(shell test -f $(top_srcdir)/configure.files && cat $(top_srcdir)/configure.files)
-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in
-$(top_srcdir)/subdirs:
-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
-$(top_srcdir)/configure.files:
-	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.files
-
-install-data-local:
-	chmod 755 $(DESTDIR)$(kde_datadir)/bibletime -R
-#>- 	$(mkinstalldirs) $(kde_appsdir)/Applications
-#>+ 1
-	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Applications
-#>- 	$(INSTALL_DATA) $(srcdir)/bibletime.desktop $(kde_appsdir)/Applications/bibletime.desktop
-#>+ 1
-	$(INSTALL_DATA) $(srcdir)/bibletime.desktop $(DESTDIR)$(kde_appsdir)/Applications/bibletime.desktop
-
-uninstall-local:
-#>- 	-rm -f $(kde_appsdir)/Applications/bibletime.desktop
-#>+ 1
-	-rm -f $(DESTDIR)$(kde_appsdir)/Applications/bibletime.desktop
-
-dist-hook:	
-	rm -f $(distdir)/bibletime-*.tar.gz $(distdir)/bibletime-*.tar.bz2
-	rm -rf `find $(distdir) -name tags -o -name TAGS -o -name \*.xcf`
-#	rm -f $(distdir)/admin/Changelog $(distdir)/make-messages.sh \
-#		$(distdir)/extractrc $(distdir)/preparetips \
-#		$(distdir)/bibletime.doxygen $(distdir)/bibletime.kdevses \
-#		$(distdir)/bibletime.start $(distdir)/configure.files \
-#		$(distdir)/bibletime/pics/gen_am.sh
-	rm -rf $(distdir)/autom4te.cache
-# 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:
-
-#>+ 2
-KDE_DIST=setupwizard.kdevprj configure.files BibleTime.kdevses subdirs BibleTime.kdevelop packaging-howto.txt stamp-h.in BibleTime.kdevelop.pcs 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-	cd $(top_srcdir) && perl admin/am_edit Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/NEWS b/NEWS
deleted file mode 100644
index 91c101d..0000000
--- a/NEWS
+++ /dev/null
@@ -1,48 +0,0 @@
-2004-01-29
-	BibleTime 1.4.1
-
-2003-12-24
-	BibleTime 1.4
-
-2003-08-24
-	BibleTime 1.3
-
-2001-06-20
-	Today we released BibleTime 1.0! It comparision with 1.0beta1 is has much more and better translations of documentation and the messages
-	and a lot of bugs were fixed.
-	BibleTime 1.0 is now stable and powerful enough to use it in your daily work with the Bible.
-
-2001-04-08
-	Today we released the first beta release of BibleTime 1.0!
-	1.0beta1 contains much improvements in comparision with version 0.31.
-	Major changes are:
-	-Better user interface in the display windows, search dialog and main index
-	-More functions like printing, improved search functions and small improvents all over the place
-	-Parallel display of Bibles, commentaries and lexicons in the display windows. Easy to use interface to hadnle the displayed modules	
-	-improved documentation
-	-Much more we can't remember... ;)
-	
-	If you find bugs, typos or other problems in this beta release please report them on www.bibletime.de (->Bugreport)!
-	We're glad for your help!
-
-2000-07-23
-	Today we release the final version of BibleTime 0.3.
-	0.3 in comparision with 0.3beta1 contains lots of bug fixes and small improvements.
-	Major changes:
-		-Full functional groupmanager (saving the position of modules, reset groupmanager, improved import-/
-		export- functions)
-		-Better highlighting algorithm in the groupmanager (faster and nicer)
-		-Better Drag&Drop: The drag&drop does look now much more nice than before. Thanks go to Martin!
-		-Improved graphical search analysis: It does now contain a labelled y-axis so you know how much
-		items were found.
-		-Complete french, german and italian translations!
-		-The handbook is available in German and English
-		-Helpdialog files are available in German and English
-				
-2000-06-29
-	Today we released the first beta version of BibleTime 0.3. It's called BibleTime 0.3beta1.
-	BibleTime 0.3 is complete rewrite, we have a much better structure now so it's easy to extend
-	it in the future.
-	Please read the file README and INSTALL for instructions how to build the stuff.
-	The final version of 0.3 will probably be released in two weeks if no bug bugs occur.
-	Thanks!
diff --git a/NEWS.in b/NEWS.in
deleted file mode 100644
index 91c101d..0000000
--- a/NEWS.in
+++ /dev/null
@@ -1,48 +0,0 @@
-2004-01-29
-	BibleTime 1.4.1
-
-2003-12-24
-	BibleTime 1.4
-
-2003-08-24
-	BibleTime 1.3
-
-2001-06-20
-	Today we released BibleTime 1.0! It comparision with 1.0beta1 is has much more and better translations of documentation and the messages
-	and a lot of bugs were fixed.
-	BibleTime 1.0 is now stable and powerful enough to use it in your daily work with the Bible.
-
-2001-04-08
-	Today we released the first beta release of BibleTime 1.0!
-	1.0beta1 contains much improvements in comparision with version 0.31.
-	Major changes are:
-	-Better user interface in the display windows, search dialog and main index
-	-More functions like printing, improved search functions and small improvents all over the place
-	-Parallel display of Bibles, commentaries and lexicons in the display windows. Easy to use interface to hadnle the displayed modules	
-	-improved documentation
-	-Much more we can't remember... ;)
-	
-	If you find bugs, typos or other problems in this beta release please report them on www.bibletime.de (->Bugreport)!
-	We're glad for your help!
-
-2000-07-23
-	Today we release the final version of BibleTime 0.3.
-	0.3 in comparision with 0.3beta1 contains lots of bug fixes and small improvements.
-	Major changes:
-		-Full functional groupmanager (saving the position of modules, reset groupmanager, improved import-/
-		export- functions)
-		-Better highlighting algorithm in the groupmanager (faster and nicer)
-		-Better Drag&Drop: The drag&drop does look now much more nice than before. Thanks go to Martin!
-		-Improved graphical search analysis: It does now contain a labelled y-axis so you know how much
-		items were found.
-		-Complete french, german and italian translations!
-		-The handbook is available in German and English
-		-Helpdialog files are available in German and English
-				
-2000-06-29
-	Today we released the first beta version of BibleTime 0.3. It's called BibleTime 0.3beta1.
-	BibleTime 0.3 is complete rewrite, we have a much better structure now so it's easy to extend
-	it in the future.
-	Please read the file README and INSTALL for instructions how to build the stuff.
-	The final version of 0.3 will probably be released in two weeks if no bug bugs occur.
-	Thanks!
diff --git a/README b/README
deleted file mode 100644
index a739762..0000000
--- a/README
+++ /dev/null
@@ -1,41 +0,0 @@
-In this file:
--------------
-	* General introduction
-	* Requirements
-	* Documentation
-	* The Sword CD
-
-General introduction:
---------------------
-This is BibleTime 1.4.1. BibleTime is a Bible study application for KDE 3.0 or later.
-
-If you find bugs please report them to info@bibletime.info or use the links on our webpage
-http://www.bibletime.info. Please do not hesitate to send suggestions or criticism info@bibletime.info.
-
-Read the file INSTALL how to install and compile this version of BibleTime. There's also a SPEC file
-to create RPMs, it's called bibletime.spec.
-
-For a list of people who contributed to BibleTime read the "About BibleTime" pages available in the
-"Help" menu of BibleTime.
-
-This README file contains some very useful instructions and tips how to use BibleTime.
-Please read also the handbook, it contains many instructions about the usage and
-installation of BibleTime.
-
-
-Requirements: see file INSTALL
--------------
-
-Documentation:
---------------
-You can find information about BibleTime, the installation and its usage in the following places:
-	o http://www.bibletime.info/
-	o The BibleTime handbook available in the Help menu of the BibleTime application
-
-The Sword CD:
--------------
-The team of BibleTime distributes the SWORD CD in Europe.
-If you live in Europe and want to get one or more CDs please have a look at www.bibletime.info. If you don't live in Europe please have a look at www.crosswire.org.
-
-Thank you!
-The BibleTime developers, <info@bibletime.info>
diff --git a/README.in b/README.in
deleted file mode 100644
index be8a628..0000000
--- a/README.in
+++ /dev/null
@@ -1,41 +0,0 @@
-In this file:
--------------
-	* General introduction
-	* Requirements
-	* Documentation
-	* The Sword CD
-
-General introduction:
---------------------
-This is BibleTime @VERSION@. BibleTime is a Bible study application for KDE 3.0 or later.
-
-If you find bugs please report them to info@bibletime.info or use the links on our webpage
-http://www.bibletime.info. Please do not hesitate to send suggestions or criticism info@bibletime.info.
-
-Read the file INSTALL how to install and compile this version of BibleTime. There's also a SPEC file
-to create RPMs, it's called bibletime.spec.
-
-For a list of people who contributed to BibleTime read the "About BibleTime" pages available in the
-"Help" menu of BibleTime.
-
-This README file contains some very useful instructions and tips how to use BibleTime.
-Please read also the handbook, it contains many instructions about the usage and
-installation of BibleTime.
-
-
-Requirements: see file INSTALL
--------------
-
-Documentation:
---------------
-You can find information about BibleTime, the installation and its usage in the following places:
-	o http://www.bibletime.info/
-	o The BibleTime handbook available in the Help menu of the BibleTime application
-
-The Sword CD:
--------------
-The team of BibleTime distributes the SWORD CD in Europe.
-If you live in Europe and want to get one or more CDs please have a look at www.bibletime.info. If you don't live in Europe please have a look at www.crosswire.org.
-
-Thank you!
-The BibleTime developers, <info@bibletime.info>
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 64a6761..0000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,11627 +0,0 @@
-##   -*- autoconf -*-
-
-dnl    This file is part of the KDE libraries/packages
-dnl    Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu)
-dnl              (C) 1997,98,99 Stephan Kulow (coolo@kde.org)
-
-dnl    This file is free software; you can redistribute it and/or
-dnl    modify it under the terms of the GNU Library General Public
-dnl    License as published by the Free Software Foundation; either
-dnl    version 2 of the License, or (at your option) any later version.
-
-dnl    This library is distributed in the hope that it will be useful,
-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl    Library General Public License for more details.
-
-dnl    You should have received a copy of the GNU Library General Public License
-dnl    along with this library; see the file COPYING.LIB.  If not, write to
-dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl    Boston, MA 02111-1307, USA.
-
-dnl IMPORTANT NOTE:
-dnl Please do not modify this file unless you expect your modifications to be
-dnl carried into every other module in the repository. 
-dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
-
-# KDE_PATH_X_DIRECT
-dnl Internal subroutine of AC_PATH_X.
-dnl Set ac_x_includes and/or ac_x_libraries.
-AC_DEFUN([KDE_PATH_X_DIRECT],
-[
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-  # First, try using that file with no special directory specified.
-AC_TRY_CPP([#include <$x_direct_test_include>],
-[# We can compile using X headers with no special include directory.
-ac_x_includes=],
-[# Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done])
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
-  # Check for the libraries.
-
-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS="$LIBS"
-  LIBS="-l$x_direct_test_library $LIBS"
-AC_TRY_LINK(, [${x_direct_test_function}()],
-[LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=],
-[LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-    /usr/X11/lib${kdelibsuff}           \
-    /usr/X11R6/lib${kdelibsuff}         \
-    /usr/X11R5/lib${kdelibsuff}         \
-    /usr/X11R4/lib${kdelibsuff}         \
-                                        \
-    /usr/lib${kdelibsuff}/X11           \
-    /usr/lib${kdelibsuff}/X11R6         \
-    /usr/lib${kdelibsuff}/X11R5         \
-    /usr/lib${kdelibsuff}/X11R4         \
-                                        \
-    /usr/local/X11/lib${kdelibsuff}     \
-    /usr/local/X11R6/lib${kdelibsuff}   \
-    /usr/local/X11R5/lib${kdelibsuff}   \
-    /usr/local/X11R4/lib${kdelibsuff}   \
-                                        \
-    /usr/local/lib${kdelibsuff}/X11     \
-    /usr/local/lib${kdelibsuff}/X11R6   \
-    /usr/local/lib${kdelibsuff}/X11R5   \
-    /usr/local/lib${kdelibsuff}/X11R4   \
-                                        \
-    /usr/X386/lib${kdelibsuff}          \
-    /usr/x386/lib${kdelibsuff}          \
-    /usr/XFree86/lib${kdelibsuff}/X11   \
-                                        \
-    /usr/lib${kdelibsuff}               \
-    /usr/local/lib${kdelibsuff}         \
-    /usr/unsupported/lib${kdelibsuff}   \
-    /usr/athena/lib${kdelibsuff}        \
-    /usr/local/x11r5/lib${kdelibsuff}   \
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
-    /lib/usr/lib${kdelibsuff}/X11       \
-                                        \
-    /usr/openwin/lib${kdelibsuff}       \
-    /usr/openwin/share/lib${kdelibsuff} \
-    ; \
-do
-dnl Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done])
-fi # $ac_x_libraries = NO
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find a file (or one of more files in a list of dirs)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
-  for j in $1;
-  do
-    echo "configure: __oline__: $i/$j" >&AC_FD_CC
-    if test -r "$i/$j"; then
-      echo "taking that" >&AC_FD_CC
-      $3=$i
-      break 2
-    fi
-  done
-done
-])
-
-dnl KDE_FIND_PATH(programm-name, variable-name, list of directories,
-dnl	if-not-found, test-parameter)
-AC_DEFUN([KDE_FIND_PATH],
-[
-   AC_MSG_CHECKING([for $1])
-   if test -n "$$2"; then
-        kde_cv_path="$$2";
-   else
-        kde_cache=`echo $1 | sed 'y%./+-%__p_%'`
-
-        AC_CACHE_VAL(kde_cv_path_$kde_cache,
-        [
-        kde_cv_path="NONE"
-	dirs="$3"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/$1"; then
-	    if test -n "$5"
-	    then
-              evalstr="$dir/$1 $5 2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/$1"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/$1"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-        ])
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      AC_MSG_RESULT(not found)
-      $4
-   else
-      AC_MSG_RESULT($kde_cv_path)
-      $2=$kde_cv_path
-
-   fi
-])
-
-AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
-[
-    AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-Please check whether you installed Qt correctly.
-You need to have a running moc binary.
-configure tried to run $ac_cv_path_moc and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable MOC to the right one before running
-configure.
-])
-])
-
-AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
-[
-    AC_MSG_WARN([No Qt ui compiler (uic) found!
-Please check whether you installed Qt correctly.
-You need to have a running uic binary.
-configure tried to run $ac_cv_path_uic and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable UIC to the right one before running
-configure.
-])
-])
-
-
-AC_DEFUN([KDE_CHECK_UIC_FLAG],
-[
-    AC_MSG_CHECKING([whether uic supports -$1 ])
-    kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'`
-    AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache,
-    [
-        cat >conftest.ui <<EOT
-        <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-EOT
-        ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null"
-        if AC_TRY_EVAL(ac_uic_testrun); then
-            eval "kde_cv_prog_uic_$kde_cache=yes"
-        else
-            eval "kde_cv_prog_uic_$kde_cache=no"
-        fi
-        rm -f conftest*
-    ])
-
-    if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-        AC_MSG_RESULT([yes])
-        :
-        $3
-    else
-        AC_MSG_RESULT([no])
-        :
-        $4
-    fi
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find the meta object compiler and the ui compiler in the PATH,
-dnl in $QTDIR/bin, and some more usual places
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_QT_MOC_UIC],
-[
-   AC_REQUIRE([KDE_CHECK_PERL])
-   qt_bindirs=""
-   for dir in $kde_qt_dirs; do
-      qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
-   done
-   qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
-   if test ! "$ac_qt_bindir" = "NO"; then
-      qt_bindirs="$ac_qt_bindir $qt_bindirs"
-   fi
-
-   KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
-   if test -z "$UIC_NOT_NEEDED"; then
-     KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
-     if test -z "$UIC_PATH" ; then
-       KDE_UIC_ERROR_MESSAGE
-       exit 1
-     else
-       UIC=$UIC_PATH
-
-       if test $kde_qtver = 3; then
-         KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
-         KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
-
-         if test x$ac_uic_supports_libpath = xyes; then
-             UIC="$UIC -L \$(kde_widgetdir)"
-         fi
-         if test x$ac_uic_supports_nounload = xyes; then
-             UIC="$UIC -nounload"
-         fi
-       fi
-     fi
-   else
-     UIC="echo uic not available: "
-   fi
-
-   AC_SUBST(MOC)
-   AC_SUBST(UIC)
-
-   UIC_TR="i18n"
-   if test $kde_qtver = 3; then
-     UIC_TR="tr2i18n"
-   fi
-
-   AC_SUBST(UIC_TR)
-])
-
-AC_DEFUN([KDE_1_CHECK_PATHS],
-[
-  KDE_1_CHECK_PATH_HEADERS
-
-  KDE_TEST_RPATH=
-
-  if test -n "$USE_RPATH"; then
-
-     if test -n "$kde_libraries"; then
-       KDE_TEST_RPATH="-R $kde_libraries"
-     fi
-
-     if test -n "$qt_libraries"; then
-       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-     fi
-
-     if test -n "$x_libraries"; then
-       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-     fi
-
-     KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-  fi
-
-AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_ERROR([your system fails at linking a small KDE application!
-Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
-For more details about this problem, look at the end of config.log.])
-fi
-
-if eval `KDEDIR= ./conftest 2>&5`; then
-  kde_result=done
-else
-  kde_result=problems
-fi
-
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-kde_have_all_paths=yes
-
-KDE_SET_PATHS($kde_result)
-
-])
-
-AC_DEFUN([KDE_SET_PATHS],
-[
-  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-	kde_htmldir=\"$kde_htmldir\" \
-	kde_appsdir=\"$kde_appsdir\" \
-	kde_icondir=\"$kde_icondir\" \
-	kde_sounddir=\"$kde_sounddir\" \
-	kde_datadir=\"$kde_datadir\" \
-	kde_locale=\"$kde_locale\" \
-	kde_cgidir=\"$kde_cgidir\" \
-	kde_confdir=\"$kde_confdir\" \
-	kde_kcfgdir=\"$kde_kcfgdir\" \
-	kde_mimedir=\"$kde_mimedir\" \
-	kde_toolbardir=\"$kde_toolbardir\" \
-	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-	kde_templatesdir=\"$kde_templatesdir\" \
-	kde_bindir=\"$kde_bindir\" \
-	kde_servicesdir=\"$kde_servicesdir\" \
-	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-	kde_moduledir=\"$kde_moduledir\" \
-	kde_styledir=\"$kde_styledir\" \
-	kde_widgetdir=\"$kde_widgetdir\" \
-	xdg_appsdir=\"$xdg_appsdir\" \
-	xdg_menudir=\"$xdg_menudir\" \
-	xdg_directorydir=\"$xdg_directorydir\" \
-	kde_result=$1"
-])
-
-AC_DEFUN([KDE_SET_DEFAULT_PATHS],
-[
-if test "$1" = "default"; then
-
-  if test -z "$kde_htmldir"; then
-    kde_htmldir='\${datadir}/doc/HTML'
-  fi
-  if test -z "$kde_appsdir"; then
-    kde_appsdir='\${datadir}/applnk'
-  fi
-  if test -z "$kde_icondir"; then
-    kde_icondir='\${datadir}/icons'
-  fi
-  if test -z "$kde_sounddir"; then
-    kde_sounddir='\${datadir}/sounds'
-  fi
-  if test -z "$kde_datadir"; then
-    kde_datadir='\${datadir}/apps'
-  fi
-  if test -z "$kde_locale"; then
-    kde_locale='\${datadir}/locale'
-  fi
-  if test -z "$kde_cgidir"; then
-    kde_cgidir='\${exec_prefix}/cgi-bin'
-  fi
-  if test -z "$kde_confdir"; then
-    kde_confdir='\${datadir}/config'
-  fi
-  if test -z "$kde_kcfgdir"; then
-    kde_kcfgdir='\${datadir}/config.kcfg'
-  fi
-  if test -z "$kde_mimedir"; then
-    kde_mimedir='\${datadir}/mimelnk'
-  fi
-  if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${datadir}/toolbar'
-  fi
-  if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${datadir}/wallpapers'
-  fi
-  if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${datadir}/templates'
-  fi
-  if test -z "$kde_bindir"; then
-    kde_bindir='\${exec_prefix}/bin'
-  fi
-  if test -z "$kde_servicesdir"; then
-    kde_servicesdir='\${datadir}/services'
-  fi
-  if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${datadir}/servicetypes'
-  fi
-  if test -z "$kde_moduledir"; then
-    if test "$kde_qtver" = "2"; then
-      kde_moduledir='\${libdir}/kde2'
-    else
-      kde_moduledir='\${libdir}/kde3'
-    fi
-  fi
-  if test -z "$kde_styledir"; then
-    kde_styledir='\${libdir}/kde3/plugins/styles'
-  fi
-  if test -z "$kde_widgetdir"; then
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
-  fi
-  if test -z "$xdg_appsdir"; then
-    xdg_appsdir='\${datadir}/applications/kde'
-  fi
-  if test -z "$xdg_menudir"; then
-    xdg_menudir='\${sysconfdir}/xdg/menus'
-  fi
-  if test -z "$xdg_directorydir"; then
-    xdg_directorydir='\${datadir}/desktop-directories'
-  fi
-
-  KDE_SET_PATHS(defaults)
-
-else
-
-  if test $kde_qtver = 1; then
-     AC_MSG_RESULT([compiling])
-     KDE_1_CHECK_PATHS
-  else
-     AC_MSG_ERROR([path checking not yet supported for KDE 2])
-  fi
-
-fi
-])
-
-AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS],
-[ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-   test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-   test -z "$kde_datadir" || test -z "$kde_locale"  ||
-   test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
-   test -z "$kde_kcfgdir" ||
-   test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-   test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-   test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-   test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-   test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-   test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-   test "x$kde_have_all_paths" != "xyes"; then
-     kde_have_all_paths=no
-  fi
-])
-
-AC_DEFUN([KDE_MISSING_PROG_ERROR],
-[
-    AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed KDE correctly.
-])
-])
-
-AC_DEFUN([KDE_MISSING_ARTS_ERROR],
-[
-    AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed aRts correctly or use
---without-arts to compile without aRts support (this will remove functionality).
-])
-])
-
-AC_DEFUN([KDE_SUBST_PROGRAMS],
-[
-    AC_ARG_WITH(arts,
-        AC_HELP_STRING([--without-arts],[build without aRts [default=yes]]),
-        [build_arts=$withval],
-        [build_arts=yes]
-    )
-    AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
-
-        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-        test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-        if test -n "$KDEDIRS"; then
-           kde_save_IFS=$IFS
-           IFS=:
-           for dir in $KDEDIRS; do
-                kde_default_bindirs="$dir/bin $kde_default_bindirs "
-           done
-           IFS=$kde_save_IFS
-        fi
-        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
-        KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
-        KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
-        if test "$build_arts" != "no"; then
-          KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
-          KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
-        fi
-        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
-        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-
-        kde32ornewer=1
-        if test "$kde_qtver" -lt 3; then
-            kde32ornewer=
-        else
-            if test "$kde_qtver" = "3" && test "$kde_qtsubver" -le 1; then
-                kde32ornewer=
-            fi
-        fi
-
-        if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
-            KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
-        fi
-        KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
-
-        if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
-            AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
-	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
-		KDE_XSL_STYLESHEET=""
-	    else
-                KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl"
-	    fi
-        fi
-
-        DCOP_DEPENDENCIES='$(DCOPIDL)'
-        if test -n "$kde32ornewer"; then
-            KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
-            DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
-            AC_SUBST(KCONFIG_COMPILER)
-            AC_SUBST(KCFG_DEPENDENCIES)
-            AC_SUBST(DCOPIDLNG)
-        fi
-        AC_SUBST(DCOPIDL)
-        AC_SUBST(DCOPIDL2CPP)
-        AC_SUBST(DCOP_DEPENDENCIES)
-        AC_SUBST(MCOPIDL)
-        AC_SUBST(ARTSCCONFIG)
-        AC_SUBST(KDECONFIG)
-	AC_SUBST(MEINPROC)
- 	AC_SUBST(KDE_XSL_STYLESHEET)
-	AC_SUBST(XMLLINT)
-
-        if test -x "$KDECONFIG"; then # it can be "compiled"
-          kde_libs_prefix=`$KDECONFIG --prefix`
-          if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-               AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
-                          This means it has been moved since you installed it.
-                          This won't work. Please recompile kdelibs for the new prefix.
-                          ])
-           fi
-           kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-        else
-           kde_libs_prefix='$(prefix)'
-           kde_libs_htmldir='$(kde_htmldir)'
-        fi
-        AC_SUBST(kde_libs_prefix)
-        AC_SUBST(kde_libs_htmldir)
-])dnl
-
-AC_DEFUN([AC_CREATE_KFSSTND],
-[
-AC_REQUIRE([AC_CHECK_RPATH])
-
-AC_MSG_CHECKING([for KDE paths])
-kde_result=""
-kde_cached_paths=yes
-AC_CACHE_VAL(kde_cv_all_paths,
-[
-  KDE_SET_DEFAULT_PATHS($1)
-  kde_cached_paths=no
-])
-eval "$kde_cv_all_paths"
-KDE_CHECK_PATHS_FOR_COMPLETENESS
-if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
-  # wrong values were cached, may be, we can set better ones
-  kde_result=
-  kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
-  kde_datadir= kde_locale=  kde_cgidir=  kde_confdir= kde_kcfgdir=
-  kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-  kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-  kde_have_all_paths=
-  kde_styledir=
-  kde_widgetdir=
-  xdg_appsdir = xdg_menudir= xdg_directorydir= 
-  KDE_SET_DEFAULT_PATHS($1)
-  eval "$kde_cv_all_paths"
-  KDE_CHECK_PATHS_FOR_COMPLETENESS
-  kde_result="$kde_result (cache overridden)"
-fi
-if test "$kde_have_all_paths" = "no"; then
-  AC_MSG_ERROR([configure could not run a little KDE program to test the environment.
-Since it had compiled and linked before, it must be a strange problem on your system.
-Look at config.log for details. If you are not able to fix this, look at
-http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-(If you're using an egcs version on Linux, you may update binutils!)
-])
-else
-  rm -f conftest*
-  AC_MSG_RESULT($kde_result)
-fi
-
-bindir=$kde_bindir
-
-KDE_SUBST_PROGRAMS
-
-])
-
-AC_DEFUN([AC_SUBST_KFSSTND],
-[
-AC_SUBST(kde_htmldir)
-AC_SUBST(kde_appsdir)
-AC_SUBST(kde_icondir)
-AC_SUBST(kde_sounddir)
-AC_SUBST(kde_datadir)
-AC_SUBST(kde_locale)
-AC_SUBST(kde_confdir)
-AC_SUBST(kde_kcfgdir)
-AC_SUBST(kde_mimedir)
-AC_SUBST(kde_wallpaperdir)
-AC_SUBST(kde_bindir)
-dnl X Desktop Group standards
-AC_SUBST(xdg_appsdir)
-AC_SUBST(xdg_menudir)
-AC_SUBST(xdg_directorydir)
-dnl for KDE 2
-AC_SUBST(kde_templatesdir)
-AC_SUBST(kde_servicesdir)
-AC_SUBST(kde_servicetypesdir)
-AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
-AC_SUBST(kde_styledir)
-AC_SUBST(kde_widgetdir)
-if test "$kde_qtver" = 1; then
-  kde_minidir="$kde_icondir/mini"
-else
-# for KDE 1 - this breaks KDE2 apps using minidir, but
-# that's the plan ;-/
-  kde_minidir="/dev/null"
-fi
-dnl AC_SUBST(kde_minidir)
-dnl AC_SUBST(kde_cgidir)
-dnl AC_SUBST(kde_toolbardir)
-])
-
-AC_DEFUN([KDE_MISC_TESTS],
-[
-   dnl Checks for libraries.
-   AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD 
-   AC_SUBST(LIBUTIL)
-   AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD
-   AC_SUBST(LIBCOMPAT)
-   kde_have_crypt=
-   AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes],
-      AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [
-        AC_MSG_WARN([you have no crypt in either libcrypt or libc.
-You should install libcrypt from another source or configure with PAM
-support])
-	kde_have_crypt=no
-      ]))
-   AC_SUBST(LIBCRYPT)
-   if test $kde_have_crypt = yes; then
-      AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
-   fi
-   AC_CHECK_SOCKLEN_T
-   AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
-   if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      AC_CHECK_LIB(dnet_stub, dnet_ntoa,
-        [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
-   fi
-   AC_CHECK_FUNC(inet_ntoa)
-   if test $ac_cv_func_inet_ntoa = no; then
-     AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
-   fi
-   AC_CHECK_FUNC(connect)
-   if test $ac_cv_func_connect = no; then
-      AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
-        $X_EXTRA_LIBS)
-   fi
-
-   AC_CHECK_FUNC(remove)
-   if test $ac_cv_func_remove = no; then
-      AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
-   fi
-
-   # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-   AC_CHECK_FUNC(shmat, ,
-     AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
-   
-   # more headers that need to be explicitly included on darwin
-   AC_CHECK_HEADERS(sys/types.h stdint.h)
-
-   # darwin requires a poll emulation library
-   AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
-
-   # CoreAudio framework
-   AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
-     AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
-     FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
-   ])
-
-   AC_CHECK_RES_INIT
-   AC_SUBST(LIB_POLL)
-   AC_SUBST(FRAMEWORK_COREAUDIO)
-   LIBSOCKET="$X_EXTRA_LIBS"
-   AC_SUBST(LIBSOCKET)
-   AC_SUBST(X_EXTRA_LIBS)
-   AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
-   AC_SUBST(LIBUCB)
-
-   case $host in  dnl this *is* LynxOS specific
-   *-*-lynxos* )
-        AC_MSG_CHECKING([LynxOS header file wrappers])
-        [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"]
-        AC_MSG_RESULT(disabled)
-        AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS
-         ;;
-    esac
-
-   KDE_CHECK_TYPES
-   KDE_CHECK_LIBDL
-   KDE_CHECK_STRLCPY
-
-# darwin needs this to initialize the environment
-AC_CHECK_HEADERS(crt_externs.h)
-AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])])
- 
-AH_VERBATIM(_DARWIN_ENVIRON,
-[
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-])
-
-AH_VERBATIM(_AIX_STRINGS_H_BZERO,
-[
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-])
-
-AC_CHECK_FUNCS([vsnprintf snprintf])
-
-AH_VERBATIM(_TRU64,[
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-])
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Find the header files and libraries for X-Windows. Extended the
-dnl macro AC_PATH_X
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([K_PATH_X],
-[
-AC_REQUIRE([KDE_MISC_TESTS])dnl
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_ARG_ENABLE(
-  embedded,
-  AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]),
-  kde_use_qt_emb=$enableval,
-  kde_use_qt_emb=no
-)
-
-AC_ARG_ENABLE(
-  qtopia,
-  AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]),
-  kde_use_qt_emb_palm=$enableval,
-  kde_use_qt_emb_palm=no
-)
-
-AC_ARG_ENABLE(
-  mac,
-  AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]),
-  kde_use_qt_mac=$enableval,
-  kde_use_qt_mac=no
-)
-
-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-
-AC_MSG_CHECKING(for X)
-
-AC_CACHE_VAL(kde_cv_have_x,
-[# One or both of the vars are not set, and there is no cached value.
-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-   kde_x_includes=NO
-else
-   kde_x_includes=$x_includes
-fi
-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-   kde_x_libraries=NO
-else
-   kde_x_libraries=$x_libraries
-fi
-
-# below we use the standard autoconf calls
-ac_x_libraries=$kde_x_libraries
-ac_x_includes=$kde_x_includes
-
-KDE_PATH_X_DIRECT
-dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries.
-dnl Unfortunately, if compiling with the N32 ABI, this is not the correct
-dnl location. The correct location is /usr/lib32 or an undefined value
-dnl (the linker is smart enough to pick the correct default library).
-dnl Things work just fine if you use just AC_PATH_X_DIRECT.
-dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to
-dnl /usr/openwin/include, which doesn't work. /usr/include does work, so
-dnl x_includes should be left alone.
-case "$host" in
-mips-sgi-irix6*)
-  ;;
-*-*-solaris*)
-  ;;
-*)
-  _AC_PATH_X_XMKMF
-  if test -z "$ac_x_includes"; then
-    ac_x_includes="."
-  fi
-  if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib${kdelibsuff}"
-  fi
-esac
-#from now on we use our own again
-
-# when the user already gave --x-includes, we ignore
-# what the standard autoconf macros told us.
-if test "$kde_x_includes" = NO; then
-  kde_x_includes=$ac_x_includes
-fi
-
-# for --x-libraries too
-if test "$kde_x_libraries" = NO; then
-  kde_x_libraries=$ac_x_libraries
-fi
-
-if test "$kde_x_includes" = NO; then
-  AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!])
-fi
-
-if test "$kde_x_libraries" = NO; then
-  AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!])
-fi
-
-# Record where we found X for the cache.
-kde_cv_have_x="have_x=yes \
-         kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-])dnl
-
-eval "$kde_cv_have_x"
-
-if test "$have_x" != yes; then
-  AC_MSG_RESULT($have_x)
-  no_x=yes
-else
-  AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes])
-fi
-
-if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-  X_INCLUDES=""
-  x_includes="."; dnl better than nothing :-
- else
-  x_includes=$kde_x_includes
-  X_INCLUDES="-I$x_includes"
-fi
-
-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
-  X_LDFLAGS=""
-  x_libraries="/usr/lib"; dnl better than nothing :-
- else
-  x_libraries=$kde_x_libraries
-  X_LDFLAGS="-L$x_libraries"
-fi
-all_includes="$X_INCLUDES"
-all_libraries="$X_LDFLAGS"
-
-# Check for libraries that X11R6 Xt/Xaw programs need.
-ac_save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-# check for ICE first), but we must link in the order -lSM -lICE or
-# we get undefined symbols.  So assume we have SM if we have ICE.
-# These have to be linked with before -lX11, unlike the other
-# libraries we check for below, so use a different variable.
-#  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-AC_CHECK_LIB(ICE, IceConnectionNumber,
-  [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS)
-LDFLAGS="$ac_save_LDFLAGS"
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-
-AC_MSG_CHECKING(for libXext)
-AC_CACHE_VAL(kde_cv_have_libXext,
-[
-kde_ldflags_safe="$LDFLAGS"
-kde_libs_safe="$LIBS"
-
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-LIBS="-lXext -lX11 $LIBSOCKET"
-
-AC_TRY_LINK([
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-],
-[
-printf("hello Xext\n");
-],
-kde_cv_have_libXext=yes,
-kde_cv_have_libXext=no
-)
-
-LDFLAGS=$kde_ldflags_safe
-LIBS=$kde_libs_safe
-])
-
-AC_MSG_RESULT($kde_cv_have_libXext)
-
-if test "$kde_cv_have_libXext" = "no"; then
-  AC_MSG_ERROR([We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either.])
-fi
-
-LIB_XEXT="-lXext"
-QTE_NORTTI=""
-
-elif test "$kde_use_qt_emb" = "yes"; then
-  dnl We're using QT Embedded
-  CPPFLAGS=-DQWS
-  CXXFLAGS="$CXXFLAGS -fno-rtti"
-  QTE_NORTTI="-fno-rtti -DQWS"
-  X_PRE_LIBS=""
-  LIB_X11=""
-  LIB_XEXT=""
-  LIB_XRENDER=""
-  LIBSM=""
-  X_INCLUDES=""
-  X_LDFLAGS=""
-  x_includes=""
-  x_libraries=""
-elif test "$kde_use_qt_mac" = "yes"; then
-  dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
-  dnl be included to get the information) --Sam
-  CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
-  CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
-  X_PRE_LIBS=""
-  LIB_X11=""
-  LIB_XEXT=""
-  LIB_XRENDER=""
-  LIBSM=""
-  X_INCLUDES=""
-  X_LDFLAGS=""
-  x_includes=""
-  x_libraries=""
-fi
-AC_SUBST(X_PRE_LIBS)
-AC_SUBST(LIB_X11)
-AC_SUBST(LIB_XRENDER)
-AC_SUBST(LIBSM)
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_includes)
-AC_SUBST(x_libraries)
-AC_SUBST(QTE_NORTTI)
-AC_SUBST(LIB_XEXT)
-
-])
-
-AC_DEFUN([KDE_PRINT_QT_PROGRAM],
-[
-AC_REQUIRE([KDE_USE_QT])
-cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qglobal.h>
-#include <qapplication.h>
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
-EOF
-
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
-#error 1
-#endif
-EOF
-fi
-fi
-
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qcursor.h>
-#include <qstylefactory.h>
-#include <private/qucomextra_p.h>
-EOF
-fi
-
-echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-cat >> conftest.$ac_ext <<EOF
-#error 1
-#endif
-
-int main() {
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-    QStringList *t = new QStringList();
-    Q_UNUSED(t);
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-    QString s;
-    s.setLatin1("Elvis is alive", 14);
-EOF
-fi
-fi
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-    (void)QStyleFactory::create(QString::null);
-    QCursor c(Qt::WhatsThisCursor);
-EOF
-fi
-cat >> conftest.$ac_ext <<EOF
-    return 0;
-}
-EOF
-])
-
-AC_DEFUN([KDE_USE_QT],
-[
-if test -z "$1"; then
-  # Current default Qt version: 3.2
-  kde_qtver=3
-  kde_qtsubver=2
-else
-  kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
-  # following is the check if subversion isnt found in passed argument
-  if test "$kde_qtsubver" = "$1"; then
-    kde_qtsubver=1
-  fi
-  kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
-  if test "$kde_qtver" = "1"; then
-    kde_qtsubver=42
-  fi
-fi
-
-if test -z "$2"; then
-  if test "$kde_qtver" = "2"; then
-    if test $kde_qtsubver -gt 0; then
-      kde_qt_minversion=">= Qt 2.2.2"
-    else
-      kde_qt_minversion=">= Qt 2.0.2"
-    fi
-  fi
-  if test "$kde_qtver" = "3"; then
-    if test $kde_qtsubver -gt 0; then
-	 if test $kde_qtsubver -gt 1; then
-	    kde_qt_minversion=">= Qt 3.2"
-	 else
-            kde_qt_minversion=">= Qt 3.1 (20021021)"
-         fi
-    else
-      kde_qt_minversion=">= Qt 3.0"
-    fi
-  fi
-  if test "$kde_qtver" = "1"; then
-    kde_qt_minversion=">= 1.42 and < 2.0"
-  fi
-else
-   kde_qt_minversion="$2"
-fi
-
-if test -z "$3"; then
-   if test $kde_qtver = 3; then
-     if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 0x03@VER@00"
-       qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
-       kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
-     else
-       kde_qt_verstring="QT_VERSION >= 300"
-     fi
-   fi
-   if test $kde_qtver = 2; then
-     if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 222"
-     else
-       kde_qt_verstring="QT_VERSION >= 200"
-     fi
-   fi
-   if test $kde_qtver = 1; then
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-   fi
-else
-   kde_qt_verstring="$3"
-fi
-
-if test $kde_qtver = 3; then
-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
-fi
-if test $kde_qtver = 2; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-fi
-if test $kde_qtver = 1; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt"
-fi
-])
-
-AC_DEFUN([KDE_CHECK_QT_DIRECT],
-[
-AC_REQUIRE([KDE_USE_QT])
-AC_MSG_CHECKING([if Qt compiles without flags])
-AC_CACHE_VAL(kde_cv_qt_direct,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_includes"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-else
-LIBS="$LIBQT $LIBSOCKET"
-fi
-LD_LIBRARY_PATH=
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-KDE_PRINT_QT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-  kde_cv_qt_direct="yes"
-else
-  kde_cv_qt_direct="no"
-  echo "configure: failed program was:" >&AC_FD_CC
-  cat conftest.$ac_ext >&AC_FD_CC
-fi
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_RESTORE
-])
-
-if test "$kde_cv_qt_direct" = "yes"; then
-  AC_MSG_RESULT(yes)
-  $1
-else
-  AC_MSG_RESULT(no)
-  $2
-fi
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the Qt headers and libraries.
-dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_QT_1_3],
-[
-AC_REQUIRE([K_PATH_X])
-AC_REQUIRE([KDE_USE_QT])
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-dnl ------------------------------------------------------------------------
-dnl Add configure flag to enable linking to MT version of Qt library.
-dnl ------------------------------------------------------------------------
-
-AC_ARG_ENABLE(
-  mt,
-  AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
-  kde_use_qt_mt=$enableval,
-  [
-    if test $kde_qtver = 3; then
-      kde_use_qt_mt=yes
-    else
-      kde_use_qt_mt=no
-    fi
-  ]
-)
-
-USING_QT_MT=""
-
-dnl ------------------------------------------------------------------------
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
-dnl ------------------------------------------------------------------------
-
-KDE_MT_LDFLAGS=
-KDE_MT_LIBS=
-if test "x$kde_use_qt_mt" = "xyes"; then
-  KDE_CHECK_THREADING
-  if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
-    KDE_MT_LDFLAGS="$USE_THREADS"
-    KDE_MT_LIBS="$LIBPTHREAD"
-  else
-    kde_use_qt_mt=no
-  fi
-fi
-AC_SUBST(KDE_MT_LDFLAGS)
-AC_SUBST(KDE_MT_LIBS)
-
-kde_qt_was_given=yes
-
-dnl ------------------------------------------------------------------------
-dnl If we haven't been told how to link to Qt, we work it out for ourselves.
-dnl ------------------------------------------------------------------------
-if test -z "$LIBQT_GLOB"; then
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    LIBQT_GLOB="libqte.*"
-  else
-    LIBQT_GLOB="libqt.*"
-  fi
-fi
-
-if test -z "$LIBQT"; then
-dnl ------------------------------------------------------------
-dnl If we got --enable-embedded then adjust the Qt library name.
-dnl ------------------------------------------------------------
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    qtlib="qte"
-  else
-    qtlib="qt"
-  fi
-
-  kde_int_qt="-l$qtlib"
-else
-  kde_int_qt="$LIBQT"
-  kde_lib_qt_set=yes
-fi
-
-if test -z "$LIBQPE"; then
-dnl ------------------------------------------------------------
-dnl If we got --enable-palmtop then add -lqpe to the link line
-dnl ------------------------------------------------------------
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    if test "x$kde_use_qt_emb_palm" = "xyes"; then
-      LIB_QPE="-lqpe"
-    else
-      LIB_QPE=""
-    fi
-  else
-    LIB_QPE=""
-  fi
-fi
-
-dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
-dnl ------------------------------------------------------------------------
-
-if test "x$kde_use_qt_mt" = "xyes"; then
-  if test -z "$LIBQT"; then
-    LIBQT="-l$qtlib-mt"
-    kde_int_qt="-l$qtlib-mt"
-  else
-    LIBQT="$qtlib-mt"
-    kde_int_qt="$qtlib-mt"
-  fi
-  LIBQT_GLOB="lib$qtlib-mt.*"
-  USING_QT_MT="using -mt"
-else
-  LIBQT="-l$qtlib"
-fi
-
-if test $kde_qtver != 1; then
-
-  AC_REQUIRE([AC_FIND_PNG])
-  AC_REQUIRE([AC_FIND_JPEG])
-  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-fi
-
-if test $kde_qtver = 3; then
-  AC_REQUIRE([KDE_CHECK_LIBDL])
-  LIBQT="$LIBQT $LIBDL"
-fi
-
-AC_MSG_CHECKING([for Qt])
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-fi
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-qt_libraries=""
-qt_includes=""
-AC_ARG_WITH(qt-dir,
-    AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
-    [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
-       ac_qt_bindir="$withval"/bin
-    ])
-
-AC_ARG_WITH(qt-includes,
-    AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
-    [
-       ac_qt_includes="$withval"
-    ])
-
-kde_qt_libs_given=no
-
-AC_ARG_WITH(qt-libraries,
-    AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
-    [  ac_qt_libraries="$withval"
-       kde_qt_libs_given=yes
-    ])
-
-AC_CACHE_VAL(ac_cv_have_qt,
-[#try to guess Qt locations
-
-qt_incdirs=""
-for dir in $kde_qt_dirs; do
-   qt_incdirs="$qt_incdirs $dir/include $dir"
-done
-qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
-if test ! "$ac_qt_includes" = "NO"; then
-   qt_incdirs="$ac_qt_includes $qt_incdirs"
-fi
-
-if test "$kde_qtver" != "1"; then
-  kde_qt_header=qstyle.h
-else
-  kde_qt_header=qglobal.h
-fi
-
-AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
-ac_qt_includes="$qt_incdir"
-
-qt_libdirs=""
-for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
-done
-qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
-if test ! "$ac_qt_libraries" = "NO"; then
-  qt_libdir=$ac_qt_libraries
-else
-  qt_libdirs="$ac_qt_libraries $qt_libdirs"
-  # if the Qt was given, the chance is too big that libqt.* doesn't exist
-  qt_libdir=NONE
-  for dir in $qt_libdirs; do
-    try="ls -1 $dir/${LIBQT_GLOB}"
-    if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-  done
-fi
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-  if test -e "$a"; then
-    LIBQT="$LIBQT ${kde_int_qt}_incremental"
-    break
-  fi
-done
-
-ac_qt_libraries="$qt_libdir"
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
-
-KDE_PRINT_QT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-  rm -f conftest*
-else
-  echo "configure: failed program was:" >&AC_FD_CC
-  cat conftest.$ac_ext >&AC_FD_CC
-  ac_qt_libraries="NO"
-fi
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-AC_LANG_RESTORE
-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
-  ac_cv_have_qt="have_qt=no"
-  ac_qt_notfound=""
-  missing_qt_mt=""
-  if test "$ac_qt_includes" = NO; then
-    if test "$ac_qt_libraries" = NO; then
-      ac_qt_notfound="(headers and libraries)";
-    else
-      ac_qt_notfound="(headers)";
-    fi
-  else
-    if test "x$kde_use_qt_mt" = "xyes"; then
-       missing_qt_mt="
-Make sure that you have compiled Qt with thread support!"
-       ac_qt_notfound="(library $qtlib-mt)";
-    else
-       ac_qt_notfound="(library $qtlib)";
-    fi
-  fi
-
-  AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-For more details about this problem, look at the end of config.log.$missing_qt_mt])
-else
-  have_qt="yes"
-fi
-])
-
-eval "$ac_cv_have_qt"
-
-if test "$have_qt" != yes; then
-  AC_MSG_RESULT([$have_qt]);
-else
-  ac_cv_have_qt="have_qt=yes \
-    ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
-  AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT])
-
-  qt_libraries="$ac_qt_libraries"
-  qt_includes="$ac_qt_includes"
-fi
-
-if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
-     KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
-fi
-
-AC_SUBST(qt_libraries)
-AC_SUBST(qt_includes)
-
-if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
-else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
-fi
-
-if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
- QT_LDFLAGS=""
-else
- QT_LDFLAGS="-L$qt_libraries"
- all_libraries="$all_libraries $QT_LDFLAGS"
-fi
-test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-
-AC_SUBST(QT_INCLUDES)
-AC_SUBST(QT_LDFLAGS)
-AC_PATH_QT_MOC_UIC
-
-KDE_CHECK_QT_JPEG
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
-else
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
-fi
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-  if test -e "$a"; then
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
-     break
-  fi
-done
-
-AC_SUBST(LIB_QT)
-AC_SUBST(LIB_QPE)
-
-AC_SUBST(kde_qtver)
-])
-
-AC_DEFUN([AC_PATH_QT],
-[
-AC_PATH_QT_1_3
-])
-
-AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
-[
-AC_REQUIRE([AC_PATH_QT_MOC_UIC])
-
-if test x$ac_uic_supports_libpath = xyes; then
-
-AC_MSG_CHECKING([if UIC has KDE plugins available])
-AC_CACHE_VAL(kde_cv_uic_plugins,
-[
-cat > actest.ui << EOF
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>NewConnectionDialog</class>
-<widget class="QDialog">
-   <widget class="KLineEdit">
-        <property name="name">
-           <cstring>testInput</cstring>
-        </property>
-   </widget>
-</widget>
-</UI>
-EOF
-       
-
-
-kde_cv_uic_plugins=no
-kde_line="$UIC_PATH -L $kde_widgetdir"
-if test x$ac_uic_supports_nounload = xyes; then
-   kde_line="$kde_line -nounload"
-fi
-kde_line="$kde_line -impl actest.h actest.ui > actest.cpp"
-if AC_TRY_EVAL(kde_line); then
-	# if you're trying to debug this check and think it's incorrect,
-	# better check your installation. The check _is_ correct - your
-	# installation is not.
-	if test -f actest.cpp && grep -i klineedit actest.cpp > /dev/null; then
-		kde_cv_uic_plugins=yes
-	fi
-fi
-rm -f actest.ui actest.cpp
-])
-
-AC_MSG_RESULT([$kde_cv_uic_plugins])
-if test "$kde_cv_uic_plugins" != yes; then
-	AC_MSG_ERROR([you need to install kdelibs first.])
-fi
-fi
-])
-
-AC_DEFUN([KDE_CHECK_FINAL],
-[
-  AC_ARG_ENABLE(final,
-	AC_HELP_STRING([--enable-final],
-		       [build size optimized apps (experimental - needs lots of memory)]),
-	kde_use_final=$enableval, kde_use_final=no)
-
-  if test "x$kde_use_final" = "xyes"; then
-      KDE_USE_FINAL_TRUE=""
-      KDE_USE_FINAL_FALSE="#"
-   else
-      KDE_USE_FINAL_TRUE="#"
-      KDE_USE_FINAL_FALSE=""
-  fi
-  AC_SUBST(KDE_USE_FINAL_TRUE)
-  AC_SUBST(KDE_USE_FINAL_FALSE)
-])
-
-AC_DEFUN([KDE_CHECK_CLOSURE],
-[
-  AC_ARG_ENABLE(closure,
-		AC_HELP_STRING([--enable-closure],[delay template instantiation]),
-  	kde_use_closure=$enableval, kde_use_closure=no)
-
-  KDE_NO_UNDEFINED=""
-  if test "x$kde_use_closure" = "xyes"; then
-       KDE_USE_CLOSURE_TRUE=""
-       KDE_USE_CLOSURE_FALSE="#"
-#       CXXFLAGS="$CXXFLAGS $REPO"
-  else
-       KDE_USE_CLOSURE_TRUE="#"
-       KDE_USE_CLOSURE_FALSE=""
-       KDE_NO_UNDEFINED=""
-       case $host in 
-         *-*-linux-gnu)
-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-		[KDE_NO_UNDEFINED=""])],
-	    [KDE_NO_UNDEFINED=""])
-           ;;
-       esac
-  fi
-  AC_SUBST(KDE_USE_CLOSURE_TRUE)
-  AC_SUBST(KDE_USE_CLOSURE_FALSE)
-  AC_SUBST(KDE_NO_UNDEFINED)
-])
-
-AC_DEFUN([KDE_CHECK_NMCHECK],
-[
-  AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]),
-	kde_use_nmcheck=$enableval, kde_use_nmcheck=no)
-
-  if test "$kde_use_nmcheck" = "yes"; then
-      KDE_USE_NMCHECK_TRUE=""
-      KDE_USE_NMCHECK_FALSE="#"
-   else
-      KDE_USE_NMCHECK_TRUE="#"
-      KDE_USE_NMCHECK_FALSE=""
-  fi
-  AC_SUBST(KDE_USE_NMCHECK_TRUE)
-  AC_SUBST(KDE_USE_NMCHECK_FALSE)
-])
-
-AC_DEFUN([KDE_EXPAND_MAKEVAR], [
-savex=$exec_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-tmp=$$2
-while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done
-exec_prefix=$savex
-])
-
-dnl ------------------------------------------------------------------------
-dnl Now, the same with KDE
-dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed)
-dnl and $(kde_includes) will be the kdehdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_BASE_PATH_KDE],
-[
-AC_REQUIRE([KDE_CHECK_STL])
-AC_REQUIRE([AC_PATH_QT])dnl
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_CHECK_RPATH
-AC_MSG_CHECKING([for KDE])
-
-if test "${prefix}" != NONE; then
-  kde_includes=${includedir}
-  KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
-
-  kde_libraries=${libdir}
-  KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
-
-else
-  ac_kde_includes=
-  ac_kde_libraries=
-  kde_libraries=""
-  kde_includes=""
-fi
-
-AC_CACHE_VAL(ac_cv_have_kde,
-[#try to guess kde locations
-
-if test "$kde_qtver" = 1; then
-  kde_check_header="ksock.h"
-  kde_check_lib="libkdecore.la"
-else
-  kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
-fi
-
-if test -z "$1"; then
-
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
-kde_incdirs="$ac_kde_includes $kde_incdirs"
-AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
-ac_kde_includes="$kde_incdir"
-
-if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
-  AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE headers installed. This will fail.
-So, check this please and use another prefix!])
-fi
-
-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
-AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-ac_kde_libraries="$kde_libdir"
-
-kde_widgetdir=NO
-dnl this might be somewhere else
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
-
-if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-So, check this please and use another prefix!])
-fi
-
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-AC_MSG_ERROR([
-I can't find the designer plugins. These are required and should have been installed
-by kdelibs])
-fi
-
-if test -n "$kde_widgetdir"; then
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
-fi
-
-
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then
-  ac_cv_have_kde="have_kde=no"
-else
-  ac_cv_have_kde="have_kde=yes \
-    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-fi
-
-else dnl test -z $1
-
-  ac_cv_have_kde="have_kde=no"
-
-fi
-])dnl
-
-eval "$ac_cv_have_kde"
-
-if test "$have_kde" != "yes"; then
- if test "${prefix}" = NONE; then
-  ac_kde_prefix="$ac_default_prefix"
- else
-  ac_kde_prefix="$prefix"
- fi
- if test "$exec_prefix" = NONE; then
-  ac_kde_exec_prefix="$ac_kde_prefix"
-  AC_MSG_RESULT([will be installed in $ac_kde_prefix])
- else
-  ac_kde_exec_prefix="$exec_prefix"
-  AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
- fi
-
- kde_libraries="${libdir}"
- kde_includes="${includedir}"
-
-else
-  ac_cv_have_kde="have_kde=yes \
-    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-  AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes])
-
-  kde_libraries="$ac_kde_libraries"
-  kde_includes="$ac_kde_includes"
-fi
-AC_SUBST(kde_libraries)
-AC_SUBST(kde_includes)
-
-if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes"  || test "$kde_includes" = "/usr/include"; then
- KDE_INCLUDES=""
-else
- KDE_INCLUDES="-I$kde_includes"
- all_includes="$KDE_INCLUDES $all_includes"
-fi
-
-KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
- 
-KDE_LDFLAGS="-L$kde_libraries"
-if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then 
- all_libraries="$all_libraries $KDE_LDFLAGS"
-fi
-
-AC_SUBST(KDE_LDFLAGS)
-AC_SUBST(KDE_INCLUDES)
-
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-all_libraries="$all_libraries $USER_LDFLAGS"
-all_includes="$all_includes $USER_INCLUDES"
-AC_SUBST(all_includes)
-AC_SUBST(all_libraries)
-
-if test -z "$1"; then
-KDE_CHECK_UIC_PLUGINS
-fi
-
-ac_kde_libraries="$kde_libdir"
-
-AC_SUBST(AUTODIRS)
-
-
-])
-
-AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
-[
-AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes,AC_HELP_STRING([--with-extra-includes=DIR],[adds non standard include paths]),
-  kde_use_extra_includes="$withval",
-  kde_use_extra_includes=NONE
-)
-kde_extra_includes=
-if test -n "$kde_use_extra_includes" && \
-   test "$kde_use_extra_includes" != "NONE"; then
-
-   ac_save_ifs=$IFS
-   IFS=':'
-   for dir in $kde_use_extra_includes; do
-     kde_extra_includes="$kde_extra_includes $dir"
-     USER_INCLUDES="$USER_INCLUDES -I$dir"
-   done
-   IFS=$ac_save_ifs
-   kde_use_extra_includes="added"
-else
-   kde_use_extra_includes="no"
-fi
-AC_SUBST(USER_INCLUDES)
-
-AC_MSG_RESULT($kde_use_extra_includes)
-
-kde_extra_libs=
-AC_MSG_CHECKING(for extra libs)
-AC_ARG_WITH(extra-libs,AC_HELP_STRING([--with-extra-libs=DIR],[adds non standard library paths]),
-  kde_use_extra_libs=$withval,
-  kde_use_extra_libs=NONE
-)
-if test -n "$kde_use_extra_libs" && \
-   test "$kde_use_extra_libs" != "NONE"; then
-
-   ac_save_ifs=$IFS
-   IFS=':'
-   for dir in $kde_use_extra_libs; do
-     kde_extra_libs="$kde_extra_libs $dir"
-     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
-     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
-   done
-   IFS=$ac_save_ifs
-   kde_use_extra_libs="added"
-else
-   kde_use_extra_libs="no"
-fi
-
-AC_SUBST(USER_LDFLAGS)
-
-AC_MSG_RESULT($kde_use_extra_libs)
-
-])
-
-AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
-[
-    AC_MSG_CHECKING([for KDE headers installed])
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include "confdefs.h"
-#include <kapp.h>
-
-int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-    printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-    printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-    printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-    printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-    printf("kde_styledir=\\"/tmp/dummy\\"\n");
-    printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-    printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-    printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-    printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-    printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-    return 0;
-    }
-EOF
-
- ac_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$all_includes $CPPFLAGS"
- if AC_TRY_EVAL(ac_compile); then
-   AC_MSG_RESULT(yes)
- else
-   AC_MSG_ERROR([your system is not able to compile a small KDE application!
-Check, if you installed the KDE header files correctly.
-For more details about this problem, look at the end of config.log.])
-  fi
-  CPPFLAGS=$ac_save_CPPFLAGS
-
-  AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_CHECK_KDEQTADDON],
-[
-AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
-[
- kde_ldflags_safe="$LDFLAGS"
- kde_libs_safe="$LIBS"
- kde_cxxflags_safe="$CXXFLAGS"
-
- LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
- LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
-
- AC_TRY_LINK([
-   #include <qdom.h>
- ],
- [
-   QDomDocument doc;
- ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
- )
-
- LDFLAGS=$kde_ldflags_safe
- LIBS=$kde_libs_safe
- CXXFLAGS=$kde_cxxflags_safe
-])
-
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
-
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
-  AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
-It is a separate package (and CVS module) named kde-qt-addon.])
-fi
-])
-
-AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
-[
-   AC_REQUIRE([KDE_MISC_TESTS])
-   AC_REQUIRE([KDE_CHECK_LIBDL])
-   AC_REQUIRE([K_PATH_X])
-
-if test $kde_qtver = 3; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
-# these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
-   AC_SUBST(LIB_KFILE, "-lkio")
-elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
-   AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
-   AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-else
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
-fi
-])
-
-AC_DEFUN([AC_PATH_KDE],
-[
-  AC_BASE_PATH_KDE
-  AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]),
-  [
-  if test "$enableval" = "no";
-    then ac_use_path_checking="default"
-    else ac_use_path_checking=""
-  fi
-  ],
-  [
-  if test "$kde_qtver" = 1;
-    then ac_use_path_checking=""
-    else ac_use_path_checking="default"
-  fi
-  ]
-  )
-
-  AC_CREATE_KFSSTND($ac_use_path_checking)
-
-  AC_SUBST_KFSSTND
-  KDE_CREATE_LIBS_ALIASES
-])
-
-dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found])
-AC_DEFUN([KDE_CHECK_FUNC_EXT],
-[
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(kde_cv_func_$1,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-kde_safe_LIBS="$LIBS"
-LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_COMPILE([
-$2
-],
-[
-$3
-],
-kde_cv_func_$1=yes,
-kde_cv_func_$1=no)
-CXXFLAGS="$save_CXXFLAGS"
-LIBS="$kde_safe_LIBS"
-AC_LANG_RESTORE
-])
-
-AC_MSG_RESULT($kde_cv_func_$1)
-
-AC_MSG_CHECKING([if $1 needs custom prototype])
-AC_CACHE_VAL(kde_cv_proto_$1,
-[
-if test "x$kde_cv_func_$1" = xyes; then
-  kde_cv_proto_$1=no
-else
-  case "$1" in
-	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_$1="yes - in libkdefakes"
-		;;
-	*)
-		kde_cv_proto_$1=unknown
-		;;
-  esac
-fi
-
-if test "x$kde_cv_proto_$1" = xunknown; then
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-  kde_safe_libs=$LIBS
-  LIBS="$LIBS $X_EXTRA_LIBS"
-  AC_TRY_LINK([
-$2
-
-extern "C" $4;
-],
-[
-$3
-],
-[ kde_cv_func_$1=yes
-  kde_cv_proto_$1=yes ],
-  [kde_cv_proto_$1="$1 unavailable"]
-)
-LIBS=$kde_safe_libs
-AC_LANG_RESTORE
-fi
-])
-AC_MSG_RESULT($kde_cv_proto_$1)
-
-if test "x$kde_cv_func_$1" = xyes; then
-  AC_DEFINE(HAVE_$5, 1, [Define if you have $1])
-  $6
-fi
-if test "x$kde_cv_proto_$1" = xno; then
-  AC_DEFINE(HAVE_$5_PROTO, 1,
-  [Define if you have the $1 prototype])
-fi
-
-AH_VERBATIM([_HAVE_$5_PROTO],
-[
-#if !defined(HAVE_$5_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-$4;
-#ifdef __cplusplus
-}
-#endif
-#endif
-])
-])
-
-AC_DEFUN([AC_CHECK_SETENV],
-[
-	KDE_CHECK_FUNC_EXT(setenv, [
-#include <stdlib.h>
-], 
-		[setenv("VAR", "VALUE", 1);],
-	        [int setenv (const char *, const char *, int)],
-		[SETENV])
-])
-
-AC_DEFUN([AC_CHECK_UNSETENV],
-[
-	KDE_CHECK_FUNC_EXT(unsetenv, [
-#include <stdlib.h>
-], 
-		[unsetenv("VAR");],
-	        [void unsetenv (const char *)],
-		[UNSETENV])
-])
-
-AC_DEFUN([AC_CHECK_GETDOMAINNAME],
-[
-	KDE_CHECK_FUNC_EXT(getdomainname, [
-#include <stdlib.h>
-#include <unistd.h>
-#include <netdb.h>
-], 
-		[
-char buffer[200];
-getdomainname(buffer, 200);
-], 	
-	        [#include <sys/types.h>
-		int getdomainname (char *, size_t)],
-		[GETDOMAINNAME])
-])
-
-AC_DEFUN([AC_CHECK_GETHOSTNAME],
-[
-	KDE_CHECK_FUNC_EXT(gethostname, [
-#include <stdlib.h>
-#include <unistd.h>
-], 
-		[
-char buffer[200];
-gethostname(buffer, 200);
-], 	
-	        [int gethostname (char *, unsigned int)],
-		[GETHOSTNAME])
-])
-
-AC_DEFUN([AC_CHECK_USLEEP],
-[
-	KDE_CHECK_FUNC_EXT(usleep, [
-#include <unistd.h>
-], 
-		[
-usleep(200);
-], 	
-	        [int usleep (unsigned int)],
-		[USLEEP])
-])
-
-
-AC_DEFUN([AC_CHECK_RANDOM],
-[
-	KDE_CHECK_FUNC_EXT(random, [
-#include <stdlib.h>
-], 
-		[
-random();
-], 	
-	        [long int random(void)],
-		[RANDOM])
-
-	KDE_CHECK_FUNC_EXT(srandom, [
-#include <stdlib.h>
-], 
-		[
-srandom(27);
-], 	
-	        [void srandom(unsigned int)],
-		[SRANDOM])
-
-])
-
-AC_DEFUN([AC_CHECK_INITGROUPS],
-[
-	KDE_CHECK_FUNC_EXT(initgroups, [
-#include <sys/types.h>
-#include <unistd.h>
-#include <grp.h>
-],
-	[
-char buffer[200];
-initgroups(buffer, 27);
-],
-	[int initgroups(const char *, gid_t)],
-	[INITGROUPS])
-])
-
-AC_DEFUN([AC_CHECK_MKSTEMPS],
-[
-	KDE_CHECK_FUNC_EXT(mkstemps, [
-#include <stdlib.h>
-#include <unistd.h>
-],
-	[
-mkstemps("/tmp/aaaXXXXXX", 6);
-],
-	[int mkstemps(char *, int)],
-	[MKSTEMPS])
-])
-
-AC_DEFUN([AC_CHECK_MKDTEMP],
-[
-	KDE_CHECK_FUNC_EXT(mkdtemp, [
-#include <stdlib.h>
-#include <unistd.h>
-],
-	[
-mkdtemp("/tmp/aaaXXXXXX");
-],
-	[char *mkdtemp(char *)],
-	[MKDTEMP])
-])
-
-
-AC_DEFUN([AC_CHECK_RES_INIT],
-[
-  AC_MSG_CHECKING([if res_init needs -lresolv])
-  kde_libs_safe="$LIBS"
-  LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-  AC_TRY_LINK(
-    [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-    ],
-    [
-      res_init(); 
-    ],
-    [
-      LIBRESOLV="-lresolv"
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-    ],
-    [ AC_MSG_RESULT(no) ]
-  )
-  LIBS=$kde_libs_safe
-  AC_SUBST(LIBRESOLV)
-
-  AC_MSG_CHECKING([if res_init is available])
-  AC_TRY_COMPILE(
-    [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-    ],
-    [
-      res_init();
-    ],
-    [
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-    ],
-    [ AC_MSG_RESULT(no) ]
-  )
-])
-
-AC_DEFUN([AC_CHECK_STRLCPY],
-[
-	KDE_CHECK_FUNC_EXT(strlcpy, [
-#include <string.h>
-],
-[ char buf[20];
-  strlcpy(buf, "KDE function test", sizeof(buf));
-],
- 	[unsigned long strlcpy(char*, const char*, unsigned long)],
-	[STRLCPY])
-])
-
-AC_DEFUN([AC_CHECK_STRLCAT],
-[
-	KDE_CHECK_FUNC_EXT(strlcat, [
-#include <string.h>
-],
-[ char buf[20];
-  buf[0]='\0';
-  strlcat(buf, "KDE function test", sizeof(buf));
-],
- 	[unsigned long strlcat(char*, const char*, unsigned long)],
-	[STRLCAT])
-])
-
-AC_DEFUN([AC_FIND_GIF],
-   [AC_MSG_CHECKING([for giflib])
-AC_CACHE_VAL(ac_cv_lib_gif,
-[ac_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
-else
-LIBS="$all_libraries -lgif"
-fi
-AC_TRY_LINK(dnl
-[
-#ifdef __cplusplus
-extern "C" {
-#endif
-int GifLastError(void);
-#ifdef __cplusplus
-}
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-],
-            [return GifLastError();],
-            eval "ac_cv_lib_gif=yes",
-            eval "ac_cv_lib_gif=no")
-LIBS="$ac_save_LIBS"
-])dnl
-if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
-else
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
-fi
-])
-
-AC_DEFUN([KDE_FIND_JPEG_HELPER],
-[
-AC_MSG_CHECKING([for libjpeg$2])
-AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
-[
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(
-[/* Override any gcc2 internal prototype to avoid an error.  */
-struct jpeg_decompress_struct;
-typedef struct jpeg_decompress_struct * j_decompress_ptr;
-typedef int size_t;
-#ifdef __cplusplus
-extern "C" {
-#endif
-    void jpeg_CreateDecompress(j_decompress_ptr cinfo,
-                                    int version, size_t structsize);
-#ifdef __cplusplus
-}
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-],
-            [jpeg_CreateDecompress(0L, 0, 0);],
-            eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
-            eval "ac_cv_lib_jpeg_$1=no")
-LIBS="$ac_save_LIBS"
-CFLAGS="$ac_save_CFLAGS"
-])
-
-if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then
-  LIBJPEG="$ac_cv_lib_jpeg_$1"
-  AC_MSG_RESULT($ac_cv_lib_jpeg_$1)
-else
-  AC_MSG_RESULT(no)
-  $3
-fi
-
-])
-
-AC_DEFUN([AC_FIND_JPEG],
-[
-dnl first look for libraries
-KDE_FIND_JPEG_HELPER(6b, 6b,
-   KDE_FIND_JPEG_HELPER(normal, [],
-    [
-       LIBJPEG=
-    ]
-   )
-)
-
-dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
-dnl requires system dependent includes loaded before it)
-jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
-test "x$jpeg_incdir" = xNO && jpeg_incdir=
-
-dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
-dnl if only one is missing, it means a configuration error, but we still
-dnl only warn
-if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-  AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
-else
-  if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-    AC_MSG_WARN([
-There is an installation error in jpeg support. You seem to have only one
-of either the headers _or_ the libraries installed. You may need to either
-provide correct --with-extra-... options, or the development package of
-libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-Disabling JPEG support.
-])
-  else
-    AC_MSG_WARN([libjpeg not found. disable JPEG support.])
-  fi
-  jpeg_incdir=
-  LIBJPEG=
-fi
-
-AC_SUBST(LIBJPEG)
-AH_VERBATIM(_AC_CHECK_JPEG,
-[/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-])
-])
-
-AC_DEFUN([KDE_CHECK_QT_JPEG],
-[
-if test -n "$LIBJPEG"; then
-AC_MSG_CHECKING([if Qt needs $LIBJPEG])
-AC_CACHE_VAL(kde_cv_qt_jpeg,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
-LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(
-[#include <qapplication.h>],
-            [
-            int argc;
-            char** argv;
-            QApplication app(argc, argv);],
-            eval "kde_cv_qt_jpeg=no",
-            eval "kde_cv_qt_jpeg=yes")
-LIBS="$ac_save_LIBS"
-CXXFLAGS="$ac_save_CXXFLAGS"
-AC_LANG_RESTORE
-fi
-])
-
-if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
-  AC_MSG_RESULT(yes)
-  LIBJPEG_QT='$(LIBJPEG)'
-else
-  AC_MSG_RESULT(no)
-  LIBJPEG_QT=
-fi
-
-])
-
-AC_DEFUN([AC_FIND_ZLIB],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for libz])
-AC_CACHE_VAL(ac_cv_lib_z,
-[
-kde_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(dnl
-[
-#include<zlib.h>
-],
-[
-  char buf[42];
-  gzFile f = (gzFile) 0;
-  /* this would segfault.. but we only link, don't run */
-  (void) gzgets(f, buf, sizeof(buf));
-
-  return (zlibVersion() == ZLIB_VERSION); 
-],
-            eval "ac_cv_lib_z='-lz'",
-            eval "ac_cv_lib_z=no")
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if test ! "$ac_cv_lib_z" = no; then
-  AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
-  LIBZ="$ac_cv_lib_z"
-  AC_MSG_RESULT($ac_cv_lib_z)
-else
-  AC_MSG_ERROR(not found. 
-          Possibly configure picks up an outdated version
-          installed by XFree86. Remove it from your system.
-
-          Check your installation and look into config.log)
-  LIBZ=""
-fi
-AC_SUBST(LIBZ)
-])
-
-AC_DEFUN([KDE_TRY_TIFFLIB],
-[
-AC_MSG_CHECKING([for libtiff $1])
-
-AC_CACHE_VAL(kde_cv_libtiff_$1,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-else
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm"
-fi
-kde_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
-[
-#include<tiffio.h>
-],
-    [return (TIFFOpen( "", "r") == 0); ],
-[
-    kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
-], [
-    kde_cv_libtiff_$1=no
-])
-
-LIBS="$kde_save_LIBS"
-CXXFLAGS="$kde_save_CXXFLAGS"
-AC_LANG_RESTORE
-])
-
-if test "$kde_cv_libtiff_$1" = "no"; then
-    AC_MSG_RESULT(no)
-    LIBTIFF=""
-    $3
-else
-    LIBTIFF="$kde_cv_libtiff_$1"
-    AC_MSG_RESULT(yes)
-    AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff])
-    $2
-fi
-
-])
-
-AC_DEFUN([AC_FIND_TIFF],
-[
-AC_REQUIRE([K_PATH_X])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_REQUIRE([AC_FIND_JPEG])
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-KDE_TRY_TIFFLIB(tiff, [],
-   KDE_TRY_TIFFLIB(tiff34))
-
-AC_SUBST(LIBTIFF)
-])
-
-
-AC_DEFUN([AC_FIND_PNG],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_MSG_CHECKING([for libpng])
-AC_CACHE_VAL(ac_cv_lib_png,
-[
-kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-else
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-fi
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
-    [
-    #include<png.h>
-    ],
-    [
-    png_structp png_ptr = png_create_read_struct(  /* image ptr */
-		PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-    return( png_ptr != 0 );
-    ],
-    eval "ac_cv_lib_png='-lpng $LIBZ -lm'",
-    eval "ac_cv_lib_png=no"
-)
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-  AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
-  LIBPNG="$ac_cv_lib_png"
-  AC_SUBST(LIBPNG)
-  AC_MSG_RESULT($ac_cv_lib_png)
-else
-  AC_MSG_RESULT(no)
-  LIBPNG=""
-  AC_SUBST(LIBPNG)
-fi
-])
-
-
-AC_DEFUN([AC_FIND_JASPER],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_JPEG])
-AC_MSG_CHECKING([for jasper])
-AC_CACHE_VAL(ac_cv_jasper,
-[
-kde_save_LIBS="$LIBS"
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
-    [
-    #include<jasper/jasper.h>
-    ],
-    [
-    return( jas_init() );
-    ],
-    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
-    eval "ac_cv_jasper=no"
-)
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then
-  AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper])
-  LIB_JASPER="$ac_cv_jasper"
-  AC_MSG_RESULT($ac_cv_jasper)
-else
-  AC_MSG_RESULT(no)
-  LIB_JASPER=""
-fi
-AC_SUBST(LIB_JASPER)
-])
-
-AC_DEFUN([AC_CHECK_BOOL],
-[
-  AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
-])
-
-AC_DEFUN([AC_CHECK_GNU_EXTENSIONS],
-[
-AC_MSG_CHECKING(if you need GNU extensions)
-AC_CACHE_VAL(ac_cv_gnu_extensions,
-[
-cat > conftest.c << EOF
-#include <features.h>
-
-#ifdef __GNU_LIBRARY__
-yes
-#endif
-EOF
-
-if (eval "$ac_cpp conftest.c") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_gnu_extensions=yes
-else
-  ac_cv_gnu_extensions=no
-fi
-])
-
-AC_MSG_RESULT($ac_cv_gnu_extensions)
-if test "$ac_cv_gnu_extensions" = "yes"; then
-  AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions])
-fi
-])
-
-AC_DEFUN([KDE_CHECK_COMPILER_FLAG],
-[
-AC_MSG_CHECKING([whether $CXX supports -$1])
-kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
-AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
-[
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -$1"
-  AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], [])
-  CXXFLAGS="$save_CXXFLAGS"
-  AC_LANG_RESTORE
-])
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- AC_MSG_RESULT(yes)
- :
- $2
-else
- AC_MSG_RESULT(no)
- :
- $3
-fi
-])
-
-dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables
-dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever])
-dnl it's all white-space separated
-AC_DEFUN([AC_REMOVE_FORBIDDEN],
-[ __val=$$1
-  __forbid=" $2 "
-  if test -n "$__val"; then
-    __new=""
-    ac_save_IFS=$IFS
-    IFS=" 	"
-    for i in $__val; do
-      case "$__forbid" in
-        *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;;
-	*) # Careful to not add spaces, where there were none, because otherwise
-	   # libtool gets confused, if we change e.g. CXX
-	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-      esac
-    done
-    IFS=$ac_save_IFS
-    $1=$__new
-  fi
-])
-
-dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
-AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
-[dnl
-if test "x$kde_use_qt_emb" != "xyes"; then
- AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
-else
- AC_REMOVE_FORBIDDEN(CXX, [-rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath])
-fi
-])
-
-AC_DEFUN([AC_CHECK_COMPILERS],
-[
-  AC_ARG_ENABLE(debug,
-	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
-  [
-    case $enableval in
-      yes)
-        kde_use_debug_code="yes"
-        kde_use_debug_define=no
-        ;;
-      full)
-        kde_use_debug_code="full"
-        kde_use_debug_define=no
-        ;;
-      *)
-        kde_use_debug_code="no"
-        kde_use_debug_define=yes
-        ;;
-    esac
-  ], 
-    [kde_use_debug_code="no"
-      kde_use_debug_define=no
-  ])
-
-  dnl Just for configure --help
-  AC_ARG_ENABLE(dummyoption,
-	        AC_HELP_STRING([--disable-debug],
-	  		       [disables debug output and debug symbols [default=no]]),
-		[],[])
-
-  AC_ARG_ENABLE(strict,
-		AC_HELP_STRING([--enable-strict],
-			      [compiles with strict compiler options (may not work!)]),
-   [
-    if test $enableval = "no"; then
-         kde_use_strict_options="no"
-       else
-         kde_use_strict_options="yes"
-    fi
-   ], [kde_use_strict_options="no"])
-
-  AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similiar]),
-   [
-    if test $enableval = "no"; then
-         kde_use_warnings="no"
-       else
-         kde_use_warnings="yes"
-    fi
-   ], [kde_use_warnings="yes"])
-
-  dnl enable warnings for debug build
-  if test "$kde_use_debug_code" != "no"; then
-    kde_use_warnings=yes
-  fi
-
-  AC_ARG_ENABLE(profile,AC_HELP_STRING([--enable-profile],[creates profiling infos [default=no]]),
-    [kde_use_profiling=$enableval],
-    [kde_use_profiling="no"]
-  )
-
-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-  CFLAGS=" $CFLAGS"
-
-  AC_PROG_CC 
-
-  AC_PROG_CPP
-
-  if test "$GCC" = "yes"; then
-    if test "$kde_use_debug_code" != "no"; then
-      if test $kde_use_debug_code = "full"; then
-        CFLAGS="-g3 -fno-inline $CFLAGS"
-      else
-        CFLAGS="-g -O2 $CFLAGS"
-      fi
-    else
-      CFLAGS="-O2 $CFLAGS"
-    fi
-  fi
-
-  if test "$kde_use_debug_define" = "yes"; then
-    CFLAGS="-DNDEBUG $CFLAGS"
-  fi
-
-
-  case "$host" in
-  *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
-  *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
-  esac
-
-  if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then
-     LDFLAGS=""
-  fi
-
-  CXXFLAGS=" $CXXFLAGS"
-
-  AC_PROG_CXX
-
-  if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-    if test "$kde_use_debug_code" != "no"; then
-      if test "$CXX" = "KCC"; then
-        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-      else
-        if test "$kde_use_debug_code" = "full"; then
-          CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
-        else
-          CXXFLAGS="-g -O2 $CXXFLAGS"
-        fi
-      fi
-      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-
-      dnl convenience compiler flags
-      KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""])
-      AC_SUBST(WOVERLOADED_VIRTUAL)
-    else
-      if test "$CXX" = "KCC"; then
-        CXXFLAGS="+K3 $CXXFLAGS"
-      else
-        CXXFLAGS="-O2 $CXXFLAGS"
-      fi  
-    fi
-  fi
-
-  if test "$kde_use_debug_define" = "yes"; then
-    CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
-  fi  
-
-  if test "$kde_use_profiling" = "yes"; then
-    KDE_CHECK_COMPILER_FLAG(pg,
-    [
-      CFLAGS="-pg $CFLAGS"
-      CXXFLAGS="-pg $CXXFLAGS"
-    ])
-  fi
-
-  if test "$kde_use_warnings" = "yes"; then
-      if test "$GCC" = "yes"; then
-        case $host in
-          *-*-linux-gnu)	
-            CFLAGS="-ansi -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
-            KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"; CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
-          ;;
-        esac
-        CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-        KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
-        KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
-        KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"])
-     fi
-  fi
-
-  if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then
-    CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
-  fi
-    
-  if test "$GXX" = "yes"; then
-    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
-    KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
-    KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
-    KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
-  fi
-  if test "$CXX" = "KCC"; then
-    dnl unfortunately we currently cannot disable exception support in KCC
-    dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
-    dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"])
-    dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS=	)
-
-    AC_ARG_ENABLE(pch,
-	AC_HELP_STRING([--enable-pch],
-		       [enables precompiled header support (currently only KCC) [default=no]]),
-    [
-      kde_use_pch=$enableval
-    ],[kde_use_pch=no])
- 
-    if test "$kde_use_pch" = "yes"; then
-      dnl TODO: support --pch-dir!
-      KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"])
-      dnl the below works (but the dir must exist), but it's
-      dnl useless for a whole package.
-      dnl The are precompiled headers for each source file, so when compiling
-      dnl from scratch, it doesn't make a difference, and they take up
-      dnl around ~5Mb _per_ sourcefile.
-      dnl KDE_CHECK_COMPILER_FLAG(-pch_dir /tmp,
-      dnl   [CXXFLAGS="$CXXFLAGS --pch_dir `pwd`/pcheaders"])
-    fi
-    dnl this flag controls inlining. by default KCC inlines in optimisation mode
-    dnl all implementations that are defined inside the class {} declaration. 
-    dnl because of templates-compatibility with broken gcc compilers, this
-    dnl can cause excessive inlining. This flag limits it to a sane level
-    KDE_CHECK_COMPILER_FLAG(-inline_keyword_space_time=6,[CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"])
-    KDE_CHECK_COMPILER_FLAG(-inline_auto_space_time=2,[CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"])
-    KDE_CHECK_COMPILER_FLAG(-inline_implicit_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"])
-    KDE_CHECK_COMPILER_FLAG(-inline_generated_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"])
-    dnl Some source files are shared between multiple executables
-    dnl (or libraries) and some of those need template instantiations.
-    dnl In that case KCC needs to compile those sources with
-    dnl --one_instantiation_per_object.  To make it easy for us we compile
-    dnl _all_ objects with that flag (--one_per is a shorthand).
-    KDE_CHECK_COMPILER_FLAG(-one_per, [CXXFLAGS="$CXXFLAGS --one_per"])
-  fi
-  AC_SUBST(USE_EXCEPTIONS)
-  dnl obsolete macro - provided to keep things going
-  USE_RTTI=
-  AC_SUBST(USE_RTTI)
-
-  case "$host" in
-      *-*-irix*)  test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;;
-      *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";;
-      *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";;
-      *-*-solaris*) 
-        if test "$GXX" = yes; then
-          libstdcpp=`$CXX -print-file-name=libstdc++.so`
-          if test ! -f $libstdcpp; then
-             AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so])
-          fi
-        fi
-        ;;
-  esac
-
-  AC_VALIDIFY_CXXFLAGS
-
-  AC_PROG_CXXCPP
-
-  if test "$GCC" = yes; then
-     NOOPT_CFLAGS=-O0
-  fi
-  KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0])
-
-  AC_SUBST(NOOPT_CXXFLAGS)
-  AC_SUBST(NOOPT_CFLAGS)
-
-  KDE_CHECK_FINAL
-  KDE_CHECK_CLOSURE
-  KDE_CHECK_NMCHECK
-
-  ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
-])
-
-AC_DEFUN([KDE_ADD_DEPENDENCIES],
-[
-   [A]M_DEPENDENCIES(CC)
-   [A]M_DEPENDENCIES(CXX)
-])
-
-dnl just a wrapper to clean up configure.in
-AC_DEFUN([KDE_PROG_LIBTOOL],
-[
-AC_REQUIRE([AC_CHECK_COMPILERS])
-AC_REQUIRE([AC_ENABLE_SHARED])
-AC_REQUIRE([AC_ENABLE_STATIC])
-
-AC_REQUIRE([AC_LIBTOOL_DLOPEN])
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_OBJEXT
-AC_EXEEXT
-
-AM_PROG_LIBTOOL
-AC_LIBTOOL_CXX
-
-LIBTOOL_SHELL="/bin/sh ./libtool"
-#  LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
-AC_SUBST(KDE_PLUGIN)
-
-# we patch configure quite some so we better keep that consistent for incremental runs 
-AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
-])
-
-AC_DEFUN([KDE_CHECK_LIB64],
-[
-    kdelibsuff=no
-    AC_ARG_ENABLE(libsuffix,
-        AC_HELP_STRING([--enable-libsuffix],
-            [/lib directory suffix (64,32,none[=default])]),
-            kdelibsuff=$enableval)
-    # TODO: add an auto case that compiles a little C app to check
-    # where the glibc is
-    if test "$kdelibsuff" = "no"; then
-       kdelibsuff=
-    fi
-    if test -z "$kdelibsuff"; then
-        AC_MSG_RESULT([not using lib directory suffix])
-        AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
-    else
-        if test "$libdir" = '${exec_prefix}/lib'; then
-            libdir="$libdir${kdelibsuff}"
-            AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
-        fi
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
-    fi
-])
-
-AC_DEFUN([KDE_CHECK_TYPES],
-[  AC_CHECK_SIZEOF(int, 4)dnl
-   AC_CHECK_SIZEOF(short)dnl
-  AC_CHECK_SIZEOF(long, 4)dnl
-  AC_CHECK_SIZEOF(char *, 4)dnl
-])dnl
-
-AC_DEFUN([KDE_DO_IT_ALL],
-[
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE($1, $2)
-AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
-AC_CHECK_COMPILERS
-KDE_PROG_LIBTOOL
-AM_KDE_WITH_NLS
-AC_PATH_KDE
-])
-
-AC_DEFUN([AC_CHECK_RPATH],
-[
-AC_MSG_CHECKING(for rpath)
-AC_ARG_ENABLE(rpath,
-      AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]),
-      USE_RPATH=$enableval, USE_RPATH=yes)
-
-if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-
-  KDE_RPATH="-R \$(kde_libraries)"
-
-  if test -n "$qt_libraries"; then
-    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-  fi
-  dnl $x_libraries is set to /usr/lib in case
-  if test -n "$X_LDFLAGS"; then
-    X_RPATH="-R \$(x_libraries)"
-    KDE_RPATH="$KDE_RPATH $X_RPATH"
-  fi
-  if test -n "$KDE_EXTRA_RPATH"; then
-    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
-  fi
-fi
-AC_SUBST(KDE_EXTRA_RPATH)
-AC_SUBST(KDE_RPATH)
-AC_SUBST(X_RPATH)
-AC_MSG_RESULT($USE_RPATH)
-])
-
-dnl Check for the type of the third argument of getsockname
-AC_DEFUN([AC_CHECK_SOCKLEN_T], [
-  AC_MSG_CHECKING(for socklen_t)
-  AC_CACHE_VAL(ac_cv_socklen_t, [
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-      ],[
-socklen_t a=0;
-getsockname(0,(struct sockaddr*)0, &a);
-      ],
-      ac_cv_socklen_t=socklen_t,
-      AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-        ],[
-int a=0;
-getsockname(0,(struct sockaddr*)0, &a);
-        ],
-        ac_cv_socklen_t=int,
-        ac_cv_socklen_t=size_t
-      )
-    )
-    AC_LANG_RESTORE
-  ])
-
-  AC_MSG_RESULT($ac_cv_socklen_t)
-  if test "$ac_cv_socklen_t" != "socklen_t"; then
-    AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t,
-        [Define the real type of socklen_t])
-  fi
-  AC_DEFINE_UNQUOTED(ksize_t, socklen_t, [Compatibility define])
-
-])
-
-dnl This is a merge of some macros out of the gettext aclocal.m4
-dnl since we don't need anything, I took the things we need
-dnl the copyright for them is:
-dnl >
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in 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 >
-dnl for this file it is relicensed under LGPL
-
-AC_DEFUN([AM_KDE_WITH_NLS],
-  [
-    dnl If we use NLS figure out what method
-
-    AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt,
-        [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt)
-    AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-     if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
-        AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it])
-        GMSGFMT=":"
-      fi
-      MSGFMT=$GMSGFMT
-      AC_SUBST(GMSGFMT)
-      AC_SUBST(MSGFMT)
-
-      AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext,
-	[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-
-      dnl Test whether we really found GNU xgettext.
-      if test "$XGETTEXT" != ":"; then
-	dnl If it is no GNU xgettext we define it as : so that the
-	dnl Makefiles still can work.
-	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  AC_MSG_RESULT(
-	    [found xgettext programs is not GNU xgettext; ignore it])
-	  XGETTEXT=":"
-	fi
-      fi
-     AC_SUBST(XGETTEXT)
-
-  ])
-
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# serial 1
-# Stephan Kulow: I appended a _KDE against name conflicts
-
-dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# serial 1
-
-AC_DEFUN([AM_LC_MESSAGES],
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your locale.h file contains LC_MESSAGES])
-    fi
-  fi])
-
-dnl From Jim Meyering.
-dnl FIXME: migrate into libit.
-
-AC_DEFUN([AM_FUNC_OBSTACK],
-[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
- [AC_TRY_LINK([#include "obstack.h"],
-	      [struct obstack *mem;obstack_free(mem,(char *) 0)],
-	      am_cv_func_obstack=yes,
-	      am_cv_func_obstack=no)])
- if test $am_cv_func_obstack = yes; then
-   AC_DEFINE(HAVE_OBSTACK)
- else
-   LIBOBJS="$LIBOBJS obstack.o"
- fi
-])
-
-dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
-dnl FIXME: Migrate into libit
-
-AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
-              am_cv_lib_error_at_line=yes,
-	      am_cv_lib_error_at_line=no)])
- if test $am_cv_lib_error_at_line = no; then
-   LIBOBJS="$LIBOBJS error.o"
- fi
- AC_SUBST(LIBOBJS)dnl
-])
-
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# serial 1
-# Stephan Kulow: I put a KDE in it to avoid name conflicts
-
-AC_DEFUN([AM_KDE_GNU_GETTEXT],
-  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-   AC_REQUIRE([AC_FUNC_MMAP])dnl
-   AC_REQUIRE([AM_KDE_WITH_NLS])dnl
-   AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
-
-   AC_MSG_CHECKING(for stpcpy)
-   AC_CACHE_VAL(kde_cv_func_stpcpy,
-   [
-   kde_safe_cxxflags=$CXXFLAGS
-   CXXFLAGS="-Werror"
-   AC_LANG_SAVE
-   AC_LANG_CPLUSPLUS
-   AC_TRY_COMPILE([
-   #include <string.h>
-   ],
-   [
-   char buffer[200];
-   stpcpy(buffer, buffer);
-   ],
-   kde_cv_func_stpcpy=yes,
-   kde_cv_func_stpcpy=no)
-   AC_LANG_RESTORE
-   CXXFLAGS=$kde_safe_cxxflags
-   ])
-   AC_MSG_RESULT($kde_cv_func_stpcpy)
-   if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then
-     AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy])
-   fi
-
-   AM_LC_MESSAGES
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-  ])
-
-AC_DEFUN([AC_HAVE_XPM],
- [AC_REQUIRE_CPP()dnl
-  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$XPM_LDFLAGS" && XPM_LDFLAGS=
- test -z "$XPM_INCLUDE" && XPM_INCLUDE=
-
- AC_ARG_WITH(xpm,AC_HELP_STRING([--without-xpm],[disable color pixmap XPM tests]),
-	xpm_test=$withval, xpm_test="yes")
- if test "x$xpm_test" = xno; then
-   ac_cv_have_xpm=no
- else
-   AC_MSG_CHECKING(for XPM)
-   AC_CACHE_VAL(ac_cv_have_xpm,
-   [
-    ac_save_ldflags="$LDFLAGS"
-    ac_save_cflags="$CFLAGS"
-    if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
-    else
-      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET"
-    fi
-    CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES"
-    test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
-    AC_TRY_LINK([#include <X11/xpm.h>],[],
-	ac_cv_have_xpm="yes",ac_cv_have_xpm="no")
-    LDFLAGS="$ac_save_ldflags"
-    CFLAGS="$ac_save_cflags"
-   ])dnl
-
-  if test "$ac_cv_have_xpm" = no; then
-    AC_MSG_RESULT(no)
-    XPM_LDFLAGS=""
-    XPMINC=""
-    $2
-  else
-    AC_DEFINE(HAVE_XPM, 1, [Define if you have XPM support])
-    if test "$XPM_LDFLAGS" = ""; then
-       XPMLIB='-lXpm $(LIB_X11)'
-    else
-       XPMLIB="-L$XPM_LDFLAGS -lXpm "'$(LIB_X11)'
-    fi
-    if test "$XPM_INCLUDE" = ""; then
-       XPMINC=""
-    else
-       XPMINC="-I$XPM_INCLUDE"
-    fi
-    AC_MSG_RESULT(yes)
-    $1
-  fi
- fi
- AC_SUBST(XPMINC)
- AC_SUBST(XPMLIB)
-])
-
-AC_DEFUN([AC_HAVE_DPMS],
- [AC_REQUIRE_CPP()dnl
-  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS=
- test -z "$DPMS_INCLUDE" && DPMS_INCLUDE=
- DPMS_LIB=
-
- AC_ARG_WITH(dpms,AC_HELP_STRING([--without-dpms],[disable DPMS power saving]),
-	dpms_test=$withval, dpms_test="yes")
- if test "x$dpms_test" = xno; then
-   ac_cv_have_dpms=no
- else
-   AC_MSG_CHECKING(for DPMS)
-   dnl Note: ac_cv_have_dpms can be no, yes, or -lXdpms.
-   dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms".
-   AC_CACHE_VAL(ac_cv_have_dpms,
-   [
-    if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then
-      AC_MSG_RESULT(no)
-      ac_cv_have_dpms="no"
-    else
-      ac_save_ldflags="$LDFLAGS"
-      ac_save_cflags="$CFLAGS"
-      ac_save_libs="$LIBS"
-      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
-      CFLAGS="$CFLAGS $X_INCLUDES"
-      test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-      AC_TRY_LINK([
-	  #include <X11/Xproto.h>
-	  #include <X11/X.h>
-	  #include <X11/Xlib.h>
-	  #include <X11/extensions/dpms.h>
-	  int foo_test_dpms()
-	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
-	  ac_cv_have_dpms="yes", [
-              LDFLAGS="$ac_save_ldflags"
-              CFLAGS="$ac_save_cflags"
-              LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
-              LIBS="$LIBS -lXdpms"
-              CFLAGS="$CFLAGS $X_INCLUDES"
-              test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-              AC_TRY_LINK([
-	          #include <X11/Xproto.h>
-        	  #include <X11/X.h>
-        	  #include <X11/Xlib.h>
-        	  #include <X11/extensions/dpms.h>
-        	  int foo_test_dpms()
-        	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
-        	  [
-                  ac_cv_have_dpms="-lXdpms"
-                  ],ac_cv_have_dpms="no")
-              ])
-      LDFLAGS="$ac_save_ldflags"
-      CFLAGS="$ac_save_cflags"
-      LIBS="$ac_save_libs"
-    fi
-   ])dnl
-
-  if test "$ac_cv_have_dpms" = no; then
-    AC_MSG_RESULT(no)
-    DPMS_LDFLAGS=""
-    DPMSINC=""
-    $2
-  else
-    AC_DEFINE(HAVE_DPMS, 1, [Define if you have DPMS support])
-    if test "$ac_cv_have_dpms" = "-lXdpms"; then
-       DPMS_LIB="-lXdpms"
-    fi
-    if test "$DPMS_LDFLAGS" = ""; then
-       DPMSLIB="$DPMS_LIB "'$(LIB_X11)'
-    else
-       DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)'
-    fi
-    if test "$DPMS_INCLUDE" = ""; then
-       DPMSINC=""
-    else
-       DPMSINC="-I$DPMS_INCLUDE"
-    fi
-    AC_MSG_RESULT(yes)
-    $1
-  fi
- fi
- ac_save_cflags="$CFLAGS"
- CFLAGS="$CFLAGS $X_INCLUDES"
- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
- AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO,
-   [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
- AC_CHECK_DECL(DPMSCapable,
-   AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
-   [#include <X11/extensions/dpms.h>])
- AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
-   [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
- AC_CHECK_DECL(DPMSInfo,
-   AC_DEFINE(HAVE_DPMSINFO_PROTO),,
-   [#include <X11/extensions/dpms.h>])
- CFLAGS="$ac_save_cflags"
- AC_SUBST(DPMSINC)
- AC_SUBST(DPMSLIB)
-])
-
-AC_DEFUN([AC_HAVE_GL],
- [AC_REQUIRE_CPP()dnl
-  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$GL_LDFLAGS" && GL_LDFLAGS=
- test -z "$GL_INCLUDE" && GL_INCLUDE=
-
- AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
-	gl_test=$withval, gl_test="yes")
- if test "x$kde_use_qt_emb" = "xyes"; then
-   # GL and Qt Embedded is a no-go for now.
-   ac_cv_have_gl=no
- elif test "x$gl_test" = xno; then
-   ac_cv_have_gl=no
- else
-   AC_MSG_CHECKING(for GL)
-   AC_CACHE_VAL(ac_cv_have_gl,
-   [
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_save_ldflags="$LDFLAGS"
-    ac_save_cxxflags="$CXXFLAGS"
-    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU"
-    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11"
-    LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET"
-    CXXFLAGS="$CFLAGS $X_INCLUDES"
-    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-    AC_TRY_LINK([#include <GL/gl.h>
-#include <GL/glu.h>
-], [],
-	ac_cv_have_gl="mesa", ac_cv_have_gl="no")
-    if test "x$ac_cv_have_gl" = "xno"; then
-      LDFLAGS="$ac_save_ldflags $X_LDFLAGS $GL_LDFLAGS $all_libraries -lGLU -lGL"
-      test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11"
-      LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET"
-      CXXFLAGS="$ac_save_cflags $X_INCLUDES"
-      test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-      AC_TRY_LINK([#include <GL/gl.h>
-#include <GL/glu.h>
-], [],
-	  ac_cv_have_gl="yes", ac_cv_have_gl="no")
-    fi
-    AC_LANG_RESTORE
-    LDFLAGS="$ac_save_ldflags"
-    CXXFLAGS="$ac_save_cxxflags"
-   ])dnl
-
-  if test "$ac_cv_have_gl" = "no"; then
-    AC_MSG_RESULT(no)
-    GL_LDFLAGS=""
-    GLINC=""
-    $2
-  else
-    AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
-    if test "$GL_LDFLAGS" = ""; then
-       if test "$ac_cv_have_gl" = "mesa"; then
-          GLLIB='-lMesaGLU -lMesaGL $(LIB_X11)'
-       else
-          GLLIB='-lGLU -lGL $(LIB_X11)'
-       fi
-    else
-       if test "$ac_cv_have_gl" = "mesa"; then
-          GLLIB="$GL_LDFLAGS -lMesaGLU -lMesaGL "'$(LIB_X11)'
-       else
-          GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
-       fi
-    fi
-    if test "$GL_INCLUDE" = ""; then
-       GLINC=""
-    else
-       GLINC="-I$GL_INCLUDE"
-    fi
-    AC_MSG_RESULT($ac_cv_have_gl)
-    $1
-  fi
- fi
- AC_SUBST(GLINC)
- AC_SUBST(GLLIB)
-])
-
-
- dnl shadow password and PAM magic - maintained by ossi@kde.org
-
-AC_DEFUN([KDE_PAM], [
-  AC_REQUIRE([KDE_CHECK_LIBDL])
-
-  want_pam=
-  AC_ARG_WITH(pam,
-    AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
-    [ if test "x$withval" = "xyes"; then
-        want_pam=yes
-        pam_service=kde
-      elif test "x$withval" = "xno"; then
-        want_pam=no
-      else
-        want_pam=yes
-        pam_service=$withval
-      fi
-    ], [ pam_service=kde ])
-
-  use_pam=
-  PAMLIBS=
-  if test "x$want_pam" != xno; then
-    AC_CHECK_LIB(pam, pam_start, [
-      AC_CHECK_HEADER(security/pam_appl.h,
-        [ pam_header=security/pam_appl.h ],
-        [ AC_CHECK_HEADER(pam/pam_appl.h,
-            [ pam_header=pam/pam_appl.h ],
-            [
-    AC_MSG_WARN([PAM detected, but no headers found!
-Make sure you have the necessary development packages installed.])
-            ]
-          )
-        ]
-      )
-    ], , $LIBDL)
-    if test -z "$pam_header"; then
-      if test "x$want_pam" = xyes; then
-        AC_MSG_ERROR([--with-pam was specified, but cannot compile with PAM!])
-      fi
-    else
-      AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
-      PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
-      use_pam=yes
-
-      dnl darwin claims to be something special
-      if test "$pam_header" = "pam/pam_appl.h"; then
-        AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your PAM headers are in pam/ instead of security/])
-      fi
-
-      dnl test whether struct pam_message is const (Linux) or not (Sun)
-      AC_MSG_CHECKING(for const pam_message)
-      AC_EGREP_HEADER([struct pam_message], $pam_header,
-        [ AC_EGREP_HEADER([const struct pam_message], $pam_header,
-                          [AC_MSG_RESULT([const: Linux-type PAM])],
-                          [AC_MSG_RESULT([nonconst: Sun-type PAM])
-                          AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])]
-                          )],
-        [AC_MSG_RESULT([not found - assume const, Linux-type PAM])])
-    fi
-  fi
-
-  AC_SUBST(PAMLIBS)
-])
-
-dnl DEF_PAM_SERVICE(arg name, full name, define name)
-AC_DEFUN([DEF_PAM_SERVICE], [
-  AC_ARG_WITH($1-pam,
-    AC_HELP_STRING([--with-$1-pam=[val]],[override PAM service from --with-pam for $2]),
-    [ if test "x$use_pam" = xyes; then
-        $3_PAM_SERVICE=$withval
-      else
-        AC_MSG_ERROR([Cannot use use --with-$1-pam, as no PAM was detected.
-You may want to enforce it by using --with-pam.])
-      fi
-    ], 
-    [ if test "x$use_pam" = xyes; then
-        $3_PAM_SERVICE="$pam_service"
-      fi
-    ])
-    if test -n "$$3_PAM_SERVICE"; then
-      AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE])
-      AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2])
-    fi
-    AC_SUBST($3_PAM_SERVICE)
-])
-
-AC_DEFUN([KDE_SHADOWPASSWD], [
-  AC_REQUIRE([KDE_PAM])
-
-  AC_CHECK_LIB(shadow, getspent,
-    [ LIBSHADOW="-lshadow"
-      ac_use_shadow=yes
-    ],
-    [ dnl for UnixWare
-      AC_CHECK_LIB(gen, getspent, 
-        [ LIBGEN="-lgen"
-          ac_use_shadow=yes
-        ], 
-        [ AC_CHECK_FUNC(getspent, 
-            [ ac_use_shadow=yes ],
-            [ ac_use_shadow=no ])
-	])
-    ])
-  AC_SUBST(LIBSHADOW)
-  AC_SUBST(LIBGEN)
-  
-  AC_MSG_CHECKING([for shadow passwords])
-
-  AC_ARG_WITH(shadow,
-    AC_HELP_STRING([--with-shadow],[If you want shadow password support]),
-    [ if test "x$withval" != "xno"; then
-        use_shadow=yes
-      else
-        use_shadow=no
-      fi
-    ], [
-      use_shadow="$ac_use_shadow"
-    ])
-
-  if test "x$use_shadow" = xyes; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_SHADOW, 1, [Define if you use shadow passwords])
-  else
-    AC_MSG_RESULT(no)
-    LIBSHADOW=
-    LIBGEN=
-  fi
-
-  dnl finally make the relevant binaries setuid root, if we have shadow passwds.
-  dnl this still applies, if we could use it indirectly through pam.
-  if test "x$use_shadow" = xyes || 
-     ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then
-      case $host in
-      *-*-freebsd* | *-*-netbsd* | *-*-openbsd*)
-	SETUIDFLAGS="-m 4755 -o root";;
-      *)
-	SETUIDFLAGS="-m 4755";;
-      esac
-  fi
-  AC_SUBST(SETUIDFLAGS)
-
-])
-
-AC_DEFUN([KDE_PASSWDLIBS], [
-  AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
-  AC_REQUIRE([KDE_PAM])
-  AC_REQUIRE([KDE_SHADOWPASSWD])
-
-  if test "x$use_pam" = "xyes"; then 
-    PASSWDLIBS="$PAMLIBS"
-  else
-    PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN"
-  fi
-
-  dnl FreeBSD uses a shadow-like setup, where /etc/passwd holds the users, but
-  dnl /etc/master.passwd holds the actual passwords.  /etc/master.passwd requires
-  dnl root to read, so kcheckpass needs to be root (even when using pam, since pam
-  dnl may need to read /etc/master.passwd).
-  case $host in
-  *-*-freebsd*)
-    SETUIDFLAGS="-m 4755 -o root"
-    ;;
-  *)
-    ;;
-  esac
-
-  AC_SUBST(PASSWDLIBS)
-])
-
-AC_DEFUN([KDE_CHECK_LIBDL],
-[
-AC_CHECK_LIB(dl, dlopen, [
-LIBDL="-ldl"
-ac_cv_have_dlfcn=yes
-])
-
-AC_CHECK_LIB(dld, shl_unload, [
-LIBDL="-ldld"
-ac_cv_have_shload=yes
-])
-
-AC_SUBST(LIBDL)
-])
-
-AC_DEFUN([KDE_CHECK_DLOPEN],
-[
-KDE_CHECK_LIBDL
-AC_CHECK_HEADERS(dlfcn.h dl.h)
-if test "$ac_cv_header_dlfcn_h" = "no"; then
-  ac_cv_have_dlfcn=no
-fi
-
-if test "$ac_cv_header_dl_h" = "no"; then
-  ac_cv_have_shload=no
-fi
-
-dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE
-dnl (MM)
-AC_ARG_ENABLE(dlopen,
-AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]),
-enable_dlopen=$enableval,
-enable_dlopen=yes)
-
-# override the user's opinion, if we know it better ;)
-if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then
-  enable_dlopen=no
-fi
-
-if test "$ac_cv_have_dlfcn" = "yes"; then
-  AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn])
-fi
-
-if test "$ac_cv_have_shload" = "yes"; then
-  AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload])
-fi
-
-if test "$enable_dlopen" = no ; then
-  test -n "$1" && eval $1
-else
-  test -n "$2" && eval $2
-fi
-
-])
-
-AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
-[
-KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no)
-KDE_PROG_LIBTOOL
-AC_MSG_CHECKING([dynamic loading])
-eval "`egrep '^build_libtool_libs=' libtool`"
-if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then
-  dynamic_loading=yes
-  AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING)
-else
-  dynamic_loading=no
-fi
-AC_MSG_RESULT($dynamic_loading)
-if test "$dynamic_loading" = "yes"; then
-  $1
-else
-  $2
-fi
-])
-
-AC_DEFUN([KDE_ADD_INCLUDES],
-[
-if test -z "$1"; then
-  test_include="Pix.h"
-else
-  test_include="$1"
-fi
-
-AC_MSG_CHECKING([for libg++ ($test_include)])
-
-AC_CACHE_VAL(kde_cv_libgpp_includes,
-[
-kde_cv_libgpp_includes=no
-
-   for ac_dir in               \
-                               \
-     /usr/include/g++          \
-     /usr/include              \
-     /usr/unsupported/include  \
-     /opt/include              \
-     $extra_include            \
-     ; \
-   do
-     if test -r "$ac_dir/$test_include"; then
-       kde_cv_libgpp_includes=$ac_dir
-       break
-     fi
-   done
-])
-
-AC_MSG_RESULT($kde_cv_libgpp_includes)
-if test "$kde_cv_libgpp_includes" != "no"; then
-  all_includes="-I$kde_cv_libgpp_includes $all_includes $USER_INCLUDES"
-fi
-])
-])
-
-AC_DEFUN([KDE_CHECK_LIBPTHREAD],
-[
-  LIBPTHREAD=""
-
-  if test -n "$PTHREAD_LIBS"; then
-    PTHREAD_LIBS_save="$PTHREAD_LIBS"
-    PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
-    KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [LIBPTHREAD="$PTHREAD_LIBS_save"] )
-    PTHREAD_LIBS="$PTHREAD_LIBS_save"
-  fi
-
-  if test -z "$LIBPTHREAD"; then
-    AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
-  fi
-
-  AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN([KDE_CHECK_PTHREAD_OPTION],
-[
-      USE_THREADS=""
-      if test -z "$LIBPTHREAD"; then
-        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"])
-      fi
-
-    AH_VERBATIM(__svr_define, [
-#if defined(__SVR4) && !defined(__svr4__)
-#define __svr4__ 1
-#endif
-])
-    case $host_os in
- 	solaris*)
-		KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"])
-                CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
-    		;;
-        freebsd*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
-                ;;
-        aix*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                LIBPTHREAD="$LIBPTHREAD -lc_r"
-                ;;
-        linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-                if test "$CXX" = "KCC"; then
-                  CXXFLAGS="$CXXFLAGS --thread_safe"
-		  NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
-                fi
-                ;;
-	*)
-		;;
-    esac
-    AC_SUBST(USE_THREADS)
-    AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN([KDE_CHECK_THREADING],
-[
-  AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-  AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION])
-  dnl default is yes if libpthread is found and no if no libpthread is available
-  if test -z "$LIBPTHREAD"; then
-    if test -z "$USE_THREADS"; then
-      kde_check_threading_default=no
-    else
-      kde_check_threading_default=yes
-    fi
-  else
-    kde_check_threading_default=yes
-  fi
-  AC_ARG_ENABLE(threading,AC_HELP_STRING([--disable-threading],[disables threading even if libpthread found]),
-   kde_use_threading=$enableval, kde_use_threading=$kde_check_threading_default)
-  if test "x$kde_use_threading" = "xyes"; then
-    AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)])
-  fi
-])
-
-AC_DEFUN([KDE_TRY_LINK_PYTHON],
-[
-if test "$kde_python_link_found" = no; then
-
-if test "$1" = normal; then
-  AC_MSG_CHECKING(if a Python application links)
-else
-  AC_MSG_CHECKING(if Python depends on $2)
-fi
-
-AC_CACHE_VAL(kde_cv_try_link_python_$1,
-[
-kde_save_cflags="$CFLAGS"
-CFLAGS="$CFLAGS $PYTHONINC"
-kde_save_libs="$LIBS"
-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
-kde_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-AC_TRY_LINK(
-[
-#include <Python.h>
-],[
-	PySys_SetArgv(1, 0);
-],
-	[kde_cv_try_link_python_$1=yes],
-	[kde_cv_try_link_python_$1=no]
-)
-CFLAGS="$kde_save_cflags"
-LIBS="$kde_save_libs"
-LDFLAGS="$kde_save_ldflags"
-])
-
-if test "$kde_cv_try_link_python_$1" = "yes"; then
-  AC_MSG_RESULT(yes)
-  kde_python_link_found=yes
-  if test ! "$1" = normal; then
-    LIBPYTHON="$LIBPYTHON $2"
-  fi
-  $3
-else
-  AC_MSG_RESULT(no)
-  $4
-fi
-
-fi
-
-])
-
-AC_DEFUN([KDE_CHECK_PYTHON_DIR],
-[
-AC_MSG_CHECKING([for Python directory])
- 
-AC_CACHE_VAL(kde_cv_pythondir,
-[
-  if test -z "$PYTHONDIR"; then
-    kde_cv_pythondir=/usr/local
-  else
-    kde_cv_pythondir="$PYTHONDIR"
-  fi
-])
- 
-AC_ARG_WITH(pythondir,
-AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]),
-[
-  ac_python_dir=$withval
-], ac_python_dir=$kde_cv_pythondir
-)
- 
-AC_MSG_RESULT($ac_python_dir)
-])
-
-AC_DEFUN([KDE_CHECK_PYTHON_INTERN],
-[
-AC_REQUIRE([KDE_CHECK_LIBDL])
-AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-AC_REQUIRE([KDE_CHECK_PYTHON_DIR])
-
-if test -z "$1"; then
-  version="1.5"
-else
-  version="$1"
-fi
-
-AC_MSG_CHECKING([for Python$version])
-
-python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-AC_FIND_FILE(Python.h, $python_incdirs, python_incdir)
-if test ! -r $python_incdir/Python.h; then
-  AC_FIND_FILE(python$version/Python.h, $python_incdirs, python_incdir)
-  python_incdir=$python_incdir/python$version
-  if test ! -r $python_incdir/Python.h; then
-    python_incdir=no
-  fi
-fi
-
-PYTHONINC=-I$python_incdir
-
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
-if test ! -r $python_libdir/libpython$version.so; then
-  AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
-  if test ! -r $python_libdir/libpython$version.a; then
-    AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir)
-    python_libdir=$python_libdir/python$version/config
-    if test ! -r $python_libdir/libpython$version.a; then
-      python_libdir=no
-    fi
-  fi
-fi
-
-PYTHONLIB=-L$python_libdir
-kde_orig_LIBPYTHON=$LIBPYTHON
-if test -z "$LIBPYTHON"; then
-  LIBPYTHON=-lpython$version
-fi
-
-AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-python_moddir=$python_moddir/python$version
-if test ! -r $python_moddir/copy.py; then
-  python_moddir=no
-fi
-
-PYTHONMODDIR=$python_moddir
-
-AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir)
-
-if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-   LIBPYTHON=$kde_orig_LIBPYTHON
-   test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-   test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-   $2
-else 
-  dnl Note: this test is very weak
-  kde_python_link_found=no
-  KDE_TRY_LINK_PYTHON(normal)
-  KDE_TRY_LINK_PYTHON(m, -lm)
-  KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD)
-  KDE_TRY_LINK_PYTHON(tcl, -ltcl)
-  KDE_TRY_LINK_PYTHON(db2, -ldb2)
-  KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm])
-  KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil])
-  KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil])
-  KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3])
-  KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil])
-  KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm])
-  KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm -lpanel -lcurses])
-  KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
-	[AC_MSG_WARN([it seems, Python depends on another library.
-    Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-    and contact the authors to let them know about this problem])
-	])
-
-  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-  AC_SUBST(PYTHONINC)
-  AC_SUBST(PYTHONLIB)
-  AC_SUBST(LIBPYTHON)
-  AC_SUBST(PYTHONMODDIR)
-  AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python])
-fi
-
-])
-
-
-AC_DEFUN([KDE_CHECK_PYTHON],
-[
-  KDE_CHECK_PYTHON_INTERN("2.3", 
-   [KDE_CHECK_PYTHON_INTERN("2.2", 
-     [KDE_CHECK_PYTHON_INTERN("2.1", 
-       [KDE_CHECK_PYTHON_INTERN("2.0", 
-         [KDE_CHECK_PYTHON_INTERN($1, $2) ])
-       ])
-     ])
-   ])
-])
-
-AC_DEFUN([KDE_CHECK_STL],
-[
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-
-    AC_MSG_CHECKING([if C++ programs can be compiled])
-    AC_CACHE_VAL(kde_cv_stl_works,
-    [
-      AC_TRY_COMPILE([
-#include <string>
-using namespace std;
-],[
-  string astring="Hallo Welt.";
-  astring.erase(0, 6); // now astring is "Welt"
-  return 0;
-], kde_cv_stl_works=yes,
-   kde_cv_stl_works=no)
-])
-
-   AC_MSG_RESULT($kde_cv_stl_works)
-
-   if test "$kde_cv_stl_works" = "yes"; then
-     # back compatible
-	 AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
-   else
-	 AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs.
-Check config.log for details - if you're using a Linux distribution you might miss
-a package named similiar to libstd++-dev.])
-   fi
-
-   CXXFLAGS="$ac_save_CXXFLAGS"
-   AC_LANG_RESTORE
-])
-
-AC_DEFUN([AC_FIND_QIMGIO],
-   [AC_REQUIRE([AC_FIND_JPEG])
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for qimgio])
-AC_CACHE_VAL(ac_cv_lib_qimgio,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_save_LIBS="$LIBS"
-ac_save_CXXFLAGS="$CXXFLAGS"
-LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-AC_TRY_RUN(dnl
-[
-#include <qimageio.h>
-#include <qstring.h>
-int main() {
-		QString t = "hallo";
-		t.fill('t');
-		qInitImageIO();
-}
-],
-            ac_cv_lib_qimgio=yes,
-            ac_cv_lib_qimgio=no,
-	    ac_cv_lib_qimgio=no)
-LIBS="$ac_save_LIBS"
-CXXFLAGS="$ac_save_CXXFLAGS"
-AC_LANG_RESTORE
-])dnl
-if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then
-  LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG"
-  AC_MSG_RESULT(yes)
-  AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available])
-  AC_SUBST(LIBQIMGIO)
-else
-  AC_MSG_RESULT(not found)
-fi
-])
-
-AC_DEFUN([AM_DISABLE_LIBRARIES],
-[
-    AC_PROVIDE([AM_ENABLE_STATIC])
-    AC_PROVIDE([AM_ENABLE_SHARED])
-    enable_static=no
-    enable_shared=yes
-])
-
-
-AC_DEFUN([AC_CHECK_UTMP_FILE],
-[
-    AC_MSG_CHECKING([for utmp file])
-
-    AC_CACHE_VAL(kde_cv_utmp_file,
-    [
-    kde_cv_utmp_file=no
-
-    for ac_file in    \
-                      \
-	/var/run/utmp \
-	/var/adm/utmp \
-	/etc/utmp     \
-     ; \
-    do
-     if test -r "$ac_file"; then
-       kde_cv_utmp_file=$ac_file
-       break
-     fi
-    done
-    ])
-
-    if test "$kde_cv_utmp_file" != "no"; then
-	AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-	$1
-	AC_MSG_RESULT($kde_cv_utmp_file)
-    else
-    	$2
-	AC_MSG_RESULT([non found])
-    fi
-])
-
-
-AC_DEFUN([KDE_CREATE_SUBDIRSLIST],
-[
-
-DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
-
-if test ! -s $srcdir/subdirs; then
-  dnl Note: Makefile.common creates subdirs, so this is just a fallback
-  TOPSUBDIRS=""
-  files=`cd $srcdir && ls -1`
-  dirs=`for i in $files; do if test -d $i; then echo $i; fi; done`
-  for i in $dirs; do
-    echo $i >> $srcdir/subdirs
-  done
-fi
-
-ac_topsubdirs=
-if test -s $srcdir/inst-apps; then
-  ac_topsubdirs="`cat $srcdir/inst-apps`"
-elif test -s $srcdir/subdirs; then
-  ac_topsubdirs="`cat $srcdir/subdirs`"
-fi
-
-for i in $ac_topsubdirs; do
-  AC_MSG_CHECKING([if $i should be compiled])
-  if test -d $srcdir/$i; then
-    install_it="yes"
-    for j in $DO_NOT_COMPILE; do
-      if test $i = $j; then
-        install_it="no"
-      fi
-    done
-  else
-    install_it="no"
-  fi
-  AC_MSG_RESULT($install_it)
-  vari=`echo $i | sed -e 's,[[-+.]],_,g'`
-  if test $install_it = "yes"; then
-    TOPSUBDIRS="$TOPSUBDIRS $i"
-    eval "$vari""_SUBDIR_included=yes"
-  else
-    eval "$vari""_SUBDIR_included=no"
-  fi
-done
-
-AC_SUBST(TOPSUBDIRS)
-])
-
-AC_DEFUN([KDE_CHECK_NAMESPACES],
-[
-AC_MSG_CHECKING(whether C++ compiler supports namespaces)
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE([
-],
-[
-namespace Foo {
-  extern int i;
-  namespace Bar {
-    extern int i;
-  }
-}
-
-int Foo::i = 0;
-int Foo::Bar::i = 1;
-],[
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_NAMESPACES)
-], [
-AC_MSG_RESULT(no)
-])
-AC_LANG_RESTORE
-])
-
-dnl ------------------------------------------------------------------------
-dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_CHECK_S_ISSOCK],
-[
-AC_MSG_CHECKING(for S_ISSOCK)
-AC_CACHE_VAL(ac_cv_have_s_issock,
-[
-AC_TRY_LINK(
-[
-#include <sys/stat.h>
-],
-[
-struct stat buff;
-int b = S_ISSOCK( buff.st_mode );
-],
-ac_cv_have_s_issock=yes,
-ac_cv_have_s_issock=no)
-])
-AC_MSG_RESULT($ac_cv_have_s_issock)
-if test "$ac_cv_have_s_issock" = "yes"; then
-  AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.])
-fi
-
-AH_VERBATIM(_ISSOCK,
-[
-#ifndef HAVE_S_ISSOCK
-#define HAVE_S_ISSOCK
-#define S_ISSOCK(mode) (1==0)
-#endif
-])
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_CHECK_KDEMAXPATHLEN],
-[
-AC_MSG_CHECKING(for MAXPATHLEN)
-AC_CACHE_VAL(ac_cv_maxpathlen,
-[
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include <sys/param.h>
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-KDE_HELLO MAXPATHLEN
-
-EOF
-
-ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
-
-if AC_TRY_EVAL(ac_try) && test -s conftest.out; then
-    ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
-else
-    ac_cv_maxpathlen=1024
-fi
-
-rm conftest.*
-
-])
-AC_MSG_RESULT($ac_cv_maxpathlen)
-AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
-])
-
-AC_DEFUN([KDE_CHECK_HEADER],
-[
-   AC_LANG_SAVE
-   kde_safe_cppflags=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $all_includes"
-   AC_LANG_CPLUSPLUS
-   AC_CHECK_HEADER([$1], [$2], [$3], [$4])
-   CPPFLAGS=$kde_safe_cppflags
-   AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_CHECK_HEADERS],
-[
-   AH_CHECK_HEADERS([$1])
-   AC_LANG_SAVE
-   kde_safe_cppflags=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $all_includes"
-   AC_LANG_CPLUSPLUS
-   AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
-   CPPFLAGS=$kde_safe_cppflags
-   AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_FAST_CONFIGURE],
-[
-  dnl makes configure fast (needs perl)
-  AC_ARG_ENABLE(fast-perl, AC_HELP_STRING([--disable-fast-perl],[disable fast Makefile generation (needs perl)]),
-      with_fast_perl=$enableval, with_fast_perl=yes)
-])
-
-AC_DEFUN([KDE_CONF_FILES],
-[
-  val=
-  if test -f $srcdir/configure.files ; then
-    val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files`
-  fi
-  CONF_FILES=
-  if test -n "$val" ; then
-    for i in $val ; do
-      CONF_FILES="$CONF_FILES $i"
-    done
-  fi
-  AC_SUBST(CONF_FILES)
-])dnl
-
-AC_DEFUN([KDE_SET_PREFIX],
-[
-  unset CDPATH
-  dnl make $KDEDIR the default for the installation
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
-
-  if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
-    ac_configure_args="$ac_configure_args --prefix=$prefix"
-  fi
-  # And delete superfluous '/' to make compares easier
-  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-  KDE_FAST_CONFIGURE
-  KDE_CONF_FILES
-])
-
-pushdef([AC_PROG_INSTALL],
-[
-  dnl our own version, testing for a -p flag
-  popdef([AC_PROG_INSTALL])
-  dnl as AC_PROG_INSTALL works as it works we first have
-  dnl to save if the user didn't specify INSTALL, as the
-  dnl autoconf one overwrites INSTALL and we have no chance to find
-  dnl out afterwards
-  test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
-  test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM
-  test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT
-  AC_PROG_INSTALL
-
-  if test -z "$kde_save_INSTALL_given" ; then
-    # OK, user hasn't given any INSTALL, autoconf found one for us
-    # now we test, if it supports the -p flag
-    AC_MSG_CHECKING(for -p flag to install)
-    rm -f confinst.$$.* > /dev/null 2>&1
-    echo "Testtest" > confinst.$$.orig
-    ac_res=no
-    if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then
-      if test -f confinst.$$.new ; then
-        # OK, -p seems to do no harm to install
-	INSTALL="${INSTALL} -p"
-	ac_res=yes
-      fi
-    fi
-    rm -f confinst.$$.*
-    AC_MSG_RESULT($ac_res)
-  fi
-  dnl the following tries to resolve some signs and wonders coming up
-  dnl with different autoconf/automake versions
-  dnl e.g.:
-  dnl  *automake 1.4 install-strip sets A_M_INSTALL_PROGRAM_FLAGS to -s
-  dnl   and has INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(A_M_INSTALL_PROGRAM_FLAGS)
-  dnl   it header-vars.am, so there the actual INSTALL_PROGRAM gets the -s
-  dnl  *automake 1.4a (and above) use INSTALL_STRIP_FLAG and only has
-  dnl   INSTALL_PROGRAM = @INSTALL_PROGRAM@ there, but changes the
-  dnl   install-@DIR@PROGRAMS targets to explicitly use that flag
-  dnl  *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as
-  dnl   INSTALL_SCRIPT, which breaks with automake <= 1.4
-  dnl  *autoconf >2.13 (since 10.Apr 1999) has not that failure
-  dnl  *sometimes KDE does not use the install-@DIR@PROGRAM targets from
-  dnl   automake (due to broken Makefile.am or whatever) to install programs,
-  dnl   and so does not see the -s flag in automake > 1.4
-  dnl to clean up that mess we:
-  dnl  +set INSTALL_PROGRAM to use INSTALL_STRIP_FLAG
-  dnl   which cleans KDE's program with automake > 1.4;
-  dnl  +set INSTALL_SCRIPT to only use INSTALL, to clean up autoconf's problems
-  dnl   with automake<=1.4
-  dnl  note that dues to this sometimes two '-s' flags are used (if KDE
-  dnl   properly uses install-@DIR@PROGRAMS, but I don't care
-  dnl
-  dnl And to all this comes, that I even can't write in comments variable
-  dnl  names used by automake, because it is so stupid to think I wanted to
-  dnl  _use_ them, therefor I have written A_M_... instead of AM_
-  dnl hmm, I wanted to say something ... ahh yes: Arghhh.
-
-  if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-    INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)'
-  fi
-  if test -z "$kde_save_INSTALL_SCRIPT_given" ; then
-    INSTALL_SCRIPT='${INSTALL}'
-  fi
-])dnl
-
-AC_DEFUN([KDE_LANG_CPLUSPLUS],
-[AC_LANG_CPLUSPLUS
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
-pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS])
-])
-
-pushdef([AC_LANG_CPLUSPLUS],
-[popdef([AC_LANG_CPLUSPLUS])
-KDE_LANG_CPLUSPLUS
-])
-
-AC_DEFUN([KDE_CHECK_LONG_LONG],
-[
-AC_MSG_CHECKING(for long long)
-AC_CACHE_VAL(kde_cv_c_long_long,
-[
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_LINK([], [
-  long long foo = 0;
-  foo = foo+1;
-  ],
-  kde_cv_c_long_long=yes, kde_cv_c_long_long=no)
-  AC_LANG_RESTORE
-])
-AC_MSG_RESULT($kde_cv_c_long_long)
-if test "$kde_cv_c_long_long" = yes; then
-   AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have long long as datatype])
-fi
-])
-
-AC_DEFUN([KDE_CHECK_LIB],
-[
-     kde_save_LDFLAGS="$LDFLAGS"
-     dnl AC_CHECK_LIB modifies LIBS, so save it here
-     kde_save_LIBS="$LIBS"
-     LDFLAGS="$LDFLAGS $all_libraries"
-     case $host_os in
-      aix*) LDFLAGS="-brtl $LDFLAGS"
-	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-	;;
-     esac
-     AC_CHECK_LIB($1, $2, $3, $4, $5)
-     LDFLAGS="$kde_save_LDFLAGS"
-     LIBS="$kde_save_LIBS"
-])
-
-AC_DEFUN([KDE_JAVA_PREFIX],
-[
-	dir=`dirname "$1"`
-	base=`basename "$1"`
-	list=`ls -1 $dir 2> /dev/null`
-	for entry in $list; do 
-		if test -d $dir/$entry/bin; then
-			case $entry in
-			   $base)
-				javadirs="$javadirs $dir/$entry/bin"
-				;;
-			esac
-		elif test -d $dir/$entry/jre/bin; then
-			case $entry in
-			   $base)
-				javadirs="$javadirs $dir/$entry/jre/bin"
-				;;
-			esac
-		fi
-	done
-])
-
-dnl KDE_CHEC_JAVA_DIR(onlyjre)
-AC_DEFUN([KDE_CHECK_JAVA_DIR],
-[
-
-AC_ARG_WITH(java,
-AC_HELP_STRING([--with-java=javadir],[use java installed in javadir, --without-java disables]),
-[  ac_java_dir=$withval
-], ac_java_dir=""
-)
-
-AC_MSG_CHECKING([for Java])
-
-dnl at this point ac_java_dir is either a dir, 'no' to disable, or '' to say look in $PATH
-if test "x$ac_java_dir" = "xno"; then
-   kde_java_bindir=no
-   kde_java_includedir=no
-   kde_java_libjvmdir=no
-   kde_java_libgcjdir=no
-   kde_java_libhpidir=no
-else
-  if test "x$ac_java_dir" = "x"; then
-     
-     
-      dnl No option set -> collect list of candidate paths
-      if test -n "$JAVA_HOME"; then
-        KDE_JAVA_PREFIX($JAVA_HOME)
-      fi
-      KDE_JAVA_PREFIX(/usr/j2se)
-      KDE_JAVA_PREFIX(/usr/lib/j2se)
-      KDE_JAVA_PREFIX(/usr/j*dk*)
-      KDE_JAVA_PREFIX(/usr/lib/j*dk*)
-      KDE_JAVA_PREFIX(/opt/j*sdk*)
-      KDE_JAVA_PREFIX(/usr/lib/java*)
-      KDE_JAVA_PREFIX(/usr/java*)
-      KDE_JAVA_PREFIX(/usr/java/j*dk*)
-      KDE_JAVA_PREFIX(/usr/java/j*re*)
-      KDE_JAVA_PREFIX(/usr/lib/SunJava2*)
-      KDE_JAVA_PREFIX(/usr/lib/SunJava*)
-      KDE_JAVA_PREFIX(/usr/lib/IBMJava2*)
-      KDE_JAVA_PREFIX(/usr/lib/IBMJava*)
-      KDE_JAVA_PREFIX(/opt/java*)
-
-      kde_cv_path="NONE"
-      kde_save_IFS=$IFS
-      IFS=':'
-      for dir in $PATH; do
-	  if test -d "$dir"; then
-	      javadirs="$javadirs $dir"
-	  fi
-      done
-      IFS=$kde_save_IFS
-      jredirs=
-
-      dnl Now javadirs contains a list of paths that exist, all ending with bin/
-      for dir in $javadirs; do
-          dnl Check for the java executable
-	  if test -x "$dir/java"; then
-	      dnl And also check for a libjvm.so somewhere under there
-	      dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
-              if test "$dir" != "/usr/bin"; then
-                  libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-		  if test ! -f $libjvmdir/libjvm.so; then continue; fi
-		  jredirs="$jredirs $dir"
-	      fi
-	  fi
-      done
-
-      dnl Now jredirs contains a reduced list, of paths where both java and ../**/libjvm.so was found
-      JAVAC=
-      JAVA=
-      kde_java_bindir=no
-      for dir in $jredirs; do
-	  JAVA="$dir/java"
-	  kde_java_bindir=$dir
-	  if test -x "$dir/javac"; then
-		JAVAC="$dir/javac"
-                break
-	  fi
-      done
-
-      if test -n "$JAVAC"; then
-          dnl this substitution might not work - well, we test for jni.h below
-          kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'`
-      else
-          kde_java_includedir=no
-      fi
-  else
-    dnl config option set
-    kde_java_bindir=$ac_java_dir/bin
-    if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then
-	kde_java_includedir=no
-    else
-        kde_java_includedir=$ac_java_dir/include
-    fi
-  fi
-fi
-
-dnl At this point kde_java_bindir and kde_java_includedir are either set or "no"
-if test "x$kde_java_bindir" != "xno"; then
-
-  dnl Look for libjvm.so
-  kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-  dnl Look for libgcj.so
-  kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
-  dnl Look for libhpi.so and avoid green threads
-  kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
-
-  dnl Now check everything's fine under there
-  dnl the include dir is our flag for having the JDK
-  if test -d "$kde_java_includedir"; then
-    if test ! -x "$kde_java_bindir/javac"; then
-      AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.])
-    fi
-    if test ! -x "$kde_java_bindir/javah"; then
-      AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-    fi
-    if test ! -x "$kde_java_bindir/jar"; then
-      AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-    fi
-    if test ! -r "$kde_java_includedir/jni.h"; then
-      AC_MSG_ERROR([jni.h not found under $kde_java_includedir. Use --with-java or --without-java.])
-    fi
-
-    jni_includes="-I$kde_java_includedir"
-    dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
-    dnl and under linux here.. 
-    
-    dnl not needed for gcj
-
-    if test "x$kde_java_libgcjdir" = "x"; then 
-      test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux"
-      test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris"
-      test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix"
-    fi
-
-  else
-    JAVAC=
-    jni_includes=
-  fi
-
-  if test "x$kde_java_libgcjdir" = "x"; then 
-     if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
-        AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
-     fi 
-  else
-     if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
-        AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.])
-     fi 
-  fi
-
-  if test ! -x "$kde_java_bindir/java"; then
-      AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-  fi
-
-  dnl not needed for gcj compile
-
-  if test "x$kde_java_libgcjdir" = "x"; then 
-      if test ! -r "$kde_java_libhpidir/libhpi.so"; then
-        AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
-      fi
-  fi
-
-  if test -n "$jni_includes"; then
-    dnl Check for JNI version
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_cxxflags_safe="$CXXFLAGS"
-    CXXFLAGS="$CXXFLAGS $all_includes $jni_includes"
-
-    AC_TRY_COMPILE([
-  #include <jni.h>
-	      ],
-	      [
-  #ifndef JNI_VERSION_1_2
-  Syntax Error
-  #endif
-	      ],[ kde_jni_works=yes ],
-	      [ kde_jni_works=no ])
-
-    if test $kde_jni_works = no; then
-      AC_MSG_ERROR([Incorrect version of $kde_java_includedir/jni.h.
-		    You need to have Java Development Kit (JDK) version 1.2. 
-
-		    Use --with-java to specify another location.
-		    Use --without-java to configure without java support.
-		    Or download a newer JDK and try again. 
-		    See e.g. http://java.sun.com/products/jdk/1.2 ])
-    fi
-
-    CXXFLAGS="$ac_cxxflags_safe"    
-    AC_LANG_RESTORE
-
-    dnl All tests ok, inform and subst the variables
-
-    JAVAC=$kde_java_bindir/javac
-    JAVAH=$kde_java_bindir/javah
-    JAR=$kde_java_bindir/jar
-    AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-    if test "x$kde_java_libgcjdir" = "x"; then 
-      JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
-    else
-      JVMLIBS="-L$kde_java_libgcjdir -lgcj"
-    fi
-    AC_MSG_RESULT([java JDK in $kde_java_bindir])
-
-  else
-      AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-      AC_MSG_RESULT([java JRE in $kde_java_bindir])
-  fi
-elif test -d "/Library/Java/Home"; then
-  kde_java_bindir="/Library/Java/Home/bin"
-  jni_includes="-I/Library/Java/Home/include"
-
-  JAVAC=$kde_java_bindir/javac
-  JAVAH=$kde_java_bindir/javah
-  JAR=$kde_java_bindir/jar
-  JVMLIBS="-Xlinker -framework -Xlinker JavaVM"
-
-  AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-  AC_MSG_RESULT([Apple Java Framework])
-else
-  AC_MSG_RESULT([none found])
-fi
-
-AC_SUBST(JAVAC)
-AC_SUBST(JAVAH)
-AC_SUBST(JAR)
-AC_SUBST(JVMLIBS)
-AC_SUBST(jni_includes)
-
-# for backward compat
-kde_cv_java_includedir=$kde_java_includedir
-kde_cv_java_bindir=$kde_java_bindir
-])
-
-dnl this is a redefinition of autoconf 2.5x's AC_FOREACH.
-dnl When the argument list becomes big, as in KDE for AC_OUTPUT in
-dnl big packages, m4_foreach is dog-slow.  So use our own version of
-dnl it.  (matz@kde.org)
-m4_define([mm_foreach],
-[m4_pushdef([$1])_mm_foreach($@)m4_popdef([$1])])
-m4_define([mm_car], [[$1]])
-m4_define([mm_car2], [[$@]])
-m4_define([_mm_foreach],
-[m4_if(m4_quote($2), [], [],
-       [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1],
-                                                   mm_car2(m4_shift($2)),
-                                                   [$3])])])
-m4_define([AC_FOREACH],
-[mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])])
-
-AC_DEFUN([KDE_NEED_FLEX],
-[
-kde_libs_safe=$LIBS
-LIBS="$LIBS $USER_LDFLAGS"
-AM_PROG_LEX
-LIBS=$kde_libs_safe
-if test -z "$LEXLIB"; then
-    AC_MSG_ERROR([You need to have flex installed.])
-fi
-AC_SUBST(LEXLIB)
-])
-
-AC_DEFUN([AC_PATH_QTOPIA],
-[
-  dnl TODO: use AC_CACHE_VAL
-
-  if test -z "$1"; then
-    qtopia_minver_maj=1
-    qtopia_minver_min=5
-    qtopia_minver_pat=0
-  else
-    qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"`
-    qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"`
-    qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"`
-  fi
-
-  qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
-  qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat"
-
-  AC_REQUIRE([AC_PATH_QT])
-
-  AC_MSG_CHECKING([for Qtopia])
-
-  LIB_QTOPIA="-lqpe"
-  AC_SUBST(LIB_QTOPIA)
-
-  kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
-
-  ac_qtopia_incdir=NO
-
-  AC_ARG_WITH(qtopia-dir,
-              AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]),
-              [  ac_qtopia_incdir="$withval"/include] ) 
-  
-  qtopia_incdirs=""
-  for dir in $kde_qtopia_dirs; do
-    qtopia_incdirs="$qtopia_incdirs $dir/include"
-  done
-
-  if test ! "$ac_qtopia_incdir" = "NO"; then
-    qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs"
-  fi
-
-  qtopia_incdir=""
-  AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir)
-  ac_qtopia_incdir="$qtopia_incdir"
-
-  if test -z "$qtopia_incdir"; then
-    AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.])
-  fi
-
-  qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`;
-  qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`;
-  qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`;
-
-  qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat"
-  qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat"
-  if test "$qtopia_ver" -lt "$qtopia_minver"; then
-    AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr
-is required.])
-  fi
-
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-
-  ac_cxxflags_safe="$CXXFLAGS"
-  ac_ldflags_safe="$LDFLAGS"
-  ac_libs_safe="$LIBS"
-
-  CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
-  LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
-
-  cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qpe/qpeapplication.h>
-#include <qpe/version.h>
-
-int main( int argc, char **argv )
-{
-    QPEApplication app( argc, argv );
-    return 0;
-}
-EOF
-
-  if AC_TRY_EVAL(ac_link) && test -s conftest; then
-    rm -f conftest*
-  else
-    rm -f conftest*
-    AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at
-the end of config.log])
-  fi
-
-  CXXFLAGS="$ac_cxxflags_safe"
-  LDFLAGS="$ac_ldflags_safe"
-  LIBS="$ac_libs_safe"
-
-  AC_LANG_RESTORE
-
-  QTOPIA_INCLUDES="-I$qtopia_incdir"
-  AC_SUBST(QTOPIA_INCLUDES)
-
-  AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir])
-])
-
-
-AC_DEFUN([KDE_INIT_DOXYGEN],
-[
-AC_MSG_CHECKING([for Qt docs])
-kde_qtdir=
-if test "${with_qt_dir+set}" = set; then
-  kde_qtdir="$with_qt_dir"
-fi
-
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-AC_MSG_RESULT($QTDOCDIR)
-
-AC_SUBST(QTDOCDIR)
-
-KDE_FIND_PATH(dot, DOT, [], [])
-if test -n "$DOT"; then
-  KDE_HAVE_DOT="YES"
-else
-  KDE_HAVE_DOT="NO"
-fi
-AC_SUBST(KDE_HAVE_DOT)
-KDE_FIND_PATH(doxygen, DOXYGEN, [], [])
-AC_SUBST(DOXYGEN)
-
-DOXYGEN_PROJECT_NAME="$1"
-DOXYGEN_PROJECT_NUMBER="$2"
-AC_SUBST(DOXYGEN_PROJECT_NAME)
-AC_SUBST(DOXYGEN_PROJECT_NUMBER)
-
-KDE_HAS_DOXYGEN=no
-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
-  KDE_HAS_DOXYGEN=yes
-fi
-AC_SUBST(KDE_HAS_DOXYGEN)
-
-])
-
-
-AC_DEFUN([AC_FIND_BZIP2],
-[
-AC_MSG_CHECKING([for bzDecompress in libbz2])
-AC_CACHE_VAL(ac_cv_lib_bzip2,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET"
-kde_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(dnl
-[
-#define BZ_NO_STDIO
-#include<bzlib.h>
-],
-            [ bz_stream s; (void) bzDecompress(&s); ],
-            eval "ac_cv_lib_bzip2='-lbz2'",
-            eval "ac_cv_lib_bzip2=no")
-LIBS="$kde_save_LIBS"
-CXXFLAGS="$kde_save_CXXFLAGS"
-AC_LANG_RESTORE
-])dnl
-AC_MSG_RESULT($ac_cv_lib_bzip2)
-
-if test ! "$ac_cv_lib_bzip2" = no; then
-  BZIP2DIR=bzip2
-
-  LIBBZ2="$ac_cv_lib_bzip2"
-  AC_SUBST(LIBBZ2)
-
-else
-
-   cxx_shared_flag=
-   ld_shared_flag=
-   KDE_CHECK_COMPILER_FLAG(shared, [
-	ld_shared_flag="-shared"
-   ])
-   KDE_CHECK_COMPILER_FLAG(fPIC, [
-        cxx_shared_flag="-fPIC"
-   ])
-
-   AC_MSG_CHECKING([for BZ2_bzDecompress in (shared) libbz2])
-   AC_CACHE_VAL(ac_cv_lib_bzip2_prefix,
-   [
-   AC_LANG_SAVE
-   AC_LANG_CPLUSPLUS
-   kde_save_LIBS="$LIBS"
-   LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET"
-   kde_save_CXXFLAGS="$CXXFLAGS"
-   CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES"
-
-   AC_TRY_LINK(dnl
-   [
-   #define BZ_NO_STDIO
-   #include<bzlib.h>
-   ],
-               [ bz_stream s; (void) BZ2_bzDecompress(&s); ],
-               eval "ac_cv_lib_bzip2_prefix='-lbz2'",
-               eval "ac_cv_lib_bzip2_prefix=no")
-   LIBS="$kde_save_LIBS"
-   CXXFLAGS="$kde_save_CXXFLAGS"
-   AC_LANG_RESTORE
-   ])dnl
-
-   AC_MSG_RESULT($ac_cv_lib_bzip2_prefix)
-   
-   if test ! "$ac_cv_lib_bzip2_prefix" = no; then
-     BZIP2DIR=bzip2
-    
-     LIBBZ2="$ac_cv_lib_bzip2_prefix"
-     AC_SUBST(LIBBZ2)
-
-     AC_DEFINE(NEED_BZ2_PREFIX, 1, [Define if the libbz2 functions need the BZ2_ prefix])
-   dnl else, we just ignore this
-   fi
-
-fi
-AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR")
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the SSL headers and libraries.
-dnl $(SSL_LDFLAGS) will be -Lsslliblocation (if needed)
-dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([KDE_CHECK_SSL],
-[
-LIBSSL="-lssl -lcrypto"
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-ac_ssl_includes=NO ac_ssl_libraries=NO
-ssl_libraries=""
-ssl_includes=""
-AC_ARG_WITH(ssl-dir,
-    AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
-    [  ac_ssl_includes="$withval"/include
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
-    ])
-
-want_ssl=yes
-AC_ARG_WITH(ssl,
-    AC_HELP_STRING([--without-ssl],[disable SSL checks]),
-    [want_ssl=$withval])
-
-if test $want_ssl = yes; then
-
-AC_MSG_CHECKING(for OpenSSL)
-
-AC_CACHE_VAL(ac_cv_have_ssl,
-[#try to guess OpenSSL locations
-  
-  ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes"
-  ssl_incdirs="$ac_ssl_includes $ssl_incdirs"
-  AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
-  ac_ssl_includes="$ssl_incdir"
-
-  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
-  if test ! "$ac_ssl_libraries" = "NO"; then
-    ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
-  fi
-
-  test=NONE
-  ssl_libdir=NONE
-  for dir in $ssl_libdirs; do
-    try="ls -1 $dir/libssl*"
-    if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-  done
-
-  ac_ssl_libraries="$ssl_libdir"
-
-  ac_ldflags_safe="$LDFLAGS"
-  ac_libs_safe="$LIBS"
-
-  LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries"
-  LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref"
-
-  AC_TRY_LINK(,void RSAPrivateEncrypt(void);RSAPrivateEncrypt();,
-  ac_ssl_rsaref="yes"
-  ,
-  ac_ssl_rsaref="no"
-  )
-
-  LDFLAGS="$ac_ldflags_safe"
-  LIBS="$ac_libs_safe"
-
-  if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then
-    have_ssl=no
-  else
-    have_ssl=yes;
-  fi
-
-  ])
-
-  eval "$ac_cv_have_ssl"
-
-  AC_MSG_RESULT([libraries $ac_ssl_libraries, headers $ac_ssl_includes])
-
-  AC_MSG_CHECKING([whether OpenSSL uses rsaref])
-  AC_MSG_RESULT($ac_ssl_rsaref)
-
-  AC_MSG_CHECKING([for easter eggs])
-  AC_MSG_RESULT([none found])
-
-else
-  have_ssl=no
-fi
-
-if test "$have_ssl" = yes; then
-  AC_MSG_CHECKING(for OpenSSL version)
-  dnl Check for SSL version
-  AC_CACHE_VAL(ac_cv_ssl_version,
-  [
-
-    cat >conftest.$ac_ext <<EOF
-#include <openssl/opensslv.h>
-#include <stdio.h>
-    int main() {
- 
-#ifndef OPENSSL_VERSION_NUMBER
-      printf("ssl_version=\\"error\\"\n");
-#else
-      if (OPENSSL_VERSION_NUMBER < 0x00906000)
-        printf("ssl_version=\\"old\\"\n");
-      else
-        printf("ssl_version=\\"ok\\"\n");
-#endif
-     return (0);
-    }
-EOF
-
-    ac_save_CPPFLAGS=$CPPFLAGS
-    if test "$ac_ssl_includes" != "/usr/include"; then
-        CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes"
-    fi
-
-    if AC_TRY_EVAL(ac_link); then 
-
-      if eval `./conftest 2>&5`; then
-        if test $ssl_version = error; then
-          AC_MSG_ERROR([$ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !])
-        else
-          if test $ssl_version = old; then
-            AC_MSG_WARN([OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled.])
-            have_ssl=no
-          fi
-        fi
-        ac_cv_ssl_version="ssl_version=$ssl_version"
-      else
-        AC_MSG_ERROR([Your system couldn't run a small SSL test program.
-        Check config.log, and if you can't figure it out, send a mail to 
-        David Faure <faure@kde.org>, attaching your config.log])
-      fi
-
-    else
-      AC_MSG_ERROR([Your system couldn't link a small SSL test program.
-      Check config.log, and if you can't figure it out, send a mail to 
-      David Faure <faure@kde.org>, attaching your config.log])
-    fi 
-    CPPFLAGS=$ac_save_CPPFLAGS
-
-  ])
-
-  eval "$ac_cv_ssl_version"
-  AC_MSG_RESULT($ssl_version)
-fi
-
-if test "$have_ssl" != yes; then
-  LIBSSL="";
-else
-  AC_DEFINE(HAVE_SSL, 1, [If we are going to use OpenSSL])
-  ac_cv_have_ssl="have_ssl=yes \
-    ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref"
-  
-  
-  ssl_libraries="$ac_ssl_libraries"
-  ssl_includes="$ac_ssl_includes"
-
-  if test "$ac_ssl_rsaref" = yes; then
-    LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref" 
-  fi
-
-  if test $ssl_version = "old"; then
-    AC_DEFINE(HAVE_OLD_SSL_API, 1, [Define if you have OpenSSL < 0.9.6])
-  fi
-fi
-
-SSL_INCLUDES=
-
-if test "$ssl_includes" = "/usr/include"; then
-  if test -f /usr/kerberos/include/krb5.h; then
-	SSL_INCLUDES="-I/usr/kerberos/include"
-  fi
-elif test  "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then
-  SSL_INCLUDES="-I$ssl_includes"
-fi
-
-if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then
- SSL_LDFLAGS=""
-else
- SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
-fi
-
-AC_SUBST(SSL_INCLUDES)
-AC_SUBST(SSL_LDFLAGS)
-AC_SUBST(LIBSSL)
-])
-
-AC_DEFUN([KDE_CHECK_STRLCPY],
-[
-  AC_REQUIRE([AC_CHECK_STRLCAT])
-  AC_REQUIRE([AC_CHECK_STRLCPY])
-  AC_CHECK_SIZEOF(size_t)
-  AC_CHECK_SIZEOF(unsigned long)
-
-  AC_MSG_CHECKING([sizeof size_t == sizeof unsigned long])
-  AC_TRY_COMPILE(,[
-    #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
-       choke me
-    #endif
-    ],AC_MSG_RESULT([yes]),[
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR([
-       Apparently on your system our assumption sizeof size_t == sizeof unsigned long 
-       does not apply. Please mail kde-devel@kde.org with a description of your system!
-      ])
-  ])
-])
-
-AC_DEFUN([KDE_CHECK_BINUTILS],
-[
-  AC_MSG_CHECKING([if ld supports unversioned version maps])
-
-  kde_save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
-  echo "{ local: extern \"C++\" { foo }; };" > conftest.map
-  AC_TRY_LINK([int foo;],
-[
-#ifdef __INTEL_COMPILER
-icc apparently does not support libtools version-info and version-script
-at the same time. Dunno where the bug is, but until somebody figured out,
-better disable the optional version scripts.
-#endif
-
-  foo = 42;
-], kde_supports_versionmaps=yes, kde_supports_versionmaps=no)
-  LDFLAGS="$kde_save_LDFLAGS"
-  rm -f conftest.map
-  AM_CONDITIONAL(include_VERSION_SCRIPT, 
-    [test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"])
-
-  AC_MSG_RESULT($kde_supports_versionmaps)
-])
-
-AC_DEFUN([AM_PROG_OBJC],[
-AC_CHECK_PROGS(OBJC, gcc, gcc)
-test -z "$OBJC" && AC_MSG_ERROR([no acceptable objective-c gcc found in \$PATH])
-if test "x${OBJCFLAGS-unset}" = xunset; then
-   OBJCFLAGS="-g -O2"
-fi
-AC_SUBST(OBJCFLAGS)
-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)])
-])
-
-AC_DEFUN([KDE_CHECK_PERL],
-[
-	KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [
-		    AC_MSG_ERROR([No Perl found in your $PATH.
-We need perl to generate some code.])
-	])
-    AC_SUBST(PERL)
-])
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
-## 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.
-
-# serial 47 AC_PROG_LIBTOOL
-
-
-# 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])])])
-
-
-# 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"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-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
-
-# 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
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-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
-])# _LT_AC_SYS_COMPILER
-
-
-# _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
-
-
-# _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)
-  # 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.
-
-  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)
-])])# _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*)
-      LINUX_64_MODE="32"
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*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*)
-      LINUX_64_MODE="64"
-      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
-  testring="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;
-    ;;
-
- *)
-    # 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.
-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      testring=$testring$testring
-    done
-    testring=
-    # 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],
-[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*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
-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
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# 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
-
-   # 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 .
-
-   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* out/*
-   rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# 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
-
-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
-
-
-# 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
-  # 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
-
-
-# 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
-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
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# 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
-   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
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# 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=".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"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-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
-  ;;
-
-bsdi4*)
-  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=".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='$(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
-  ;;
-
-freebsd*-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='.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='.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='.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'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
-      libsuff=64
-    fi
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-  # 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'
-  ;;
-
-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}${release}${shared_ext} ${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=".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
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _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
-
-  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"; 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
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# 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
-
-
-# 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
-
-
-# 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
-
-
-# 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
-
-
-# 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
-
-
-# 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
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# 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
-
-
-# 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
-
-
-# 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])
-])])
-
-
-# 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
-
-*** 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
-
-
-# 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
-  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
-])# 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'
-])# 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
-  ;;
-
-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
-  ;;
-
-cygwin* | mingw* | pw32*)
-  # 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='win32_libid'
-  ;;
-
-darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  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=`/System/Library/Frameworks/System.framework/System`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-  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 $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 must be Linux ELF.
-linux*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
-  arm* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
-  esac
-  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]]+|_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*)
-  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
-  ;;
-
-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
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-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
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# 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")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# 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([AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-
-# 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
-
-
-#
-# 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*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      ;;
-    esac
-    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}'
-    _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)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=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"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# 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([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
-      # KDE requires run time linking.  Make it the default.
-      aix_use_runtimelinking=yes
-      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='-qmkshrobj ${wl}-G'
-	else
-	  shared_flag='-qmkshrobj'
-	fi
-      fi
-    fi
-
-    # Let the compiler handle the export list.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    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_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` '" $shared_flag"
-      _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}$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*)
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep '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 ${wl}-bind_at_load -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 ${wl}-bind_at_load $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 ${wl}-bind_at_load -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}'
-    _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)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  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*)
-    # 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) | egrep "\-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
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_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'
-	_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::"'
-    ;;
-  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
-])# 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|*.$libext)
-       # 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*)
-  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
-
-## 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"
-])# 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 \
-    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.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# 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=$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='$shrext'
-
-# 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.
-  test -f Makefile && make "$ltmain"
-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'"
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris* | sysv5*)
-  symcode='[[BDT]]'
-  ;;
-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='[[ABCDGISTW]]' ;;
-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
-	;;
-      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*)
-	# 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
-      ;;
-
-    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.
-
-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
-      ;;
-
-    *)
-      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
-
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
-	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='-qmkshrobj ${wl}-G'
-	  else
-	    shared_flag='-qmkshrobj'
-  	fi
-	fi
-      fi
-
-      # Let the compiler handle the export list.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      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_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` '" $shared_flag"
-	_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}$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
-      ;;
-
-    bsdi4*)
-      _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=".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*)
-    if test "$GXX" = yes ; then
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      case "$host_os" in
-      rhapsody* | darwin1.[[012]])
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-	test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep '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 ${wl}-bind_at_load -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 ${wl}-bind_at_load $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 ${wl}-bind_at_load -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}'
-      _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)='-all_load $convenience'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    else  
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    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*)
-      _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(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
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# 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])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-############################################################
-# 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])
-])
-##	-*- autoconf -*-
-dnl This file was created by Joachim Ansorg <joachim@ansorgs.de>
-dnl It provides macord for the autoconf package to find the Sword library on your system.
-
-dnl ----------------------------------------------------------------------
-dnl		Check wheter to use static linking
-dnl		first parameter is the required version
-dnl		second is whether to use static sword library
-dnl ----------------------------------------------------------------------
-AC_DEFUN(AC_CHECK_SWORD,
-[
-dnl AC_MSG_CHECKING([for a Sword installation])
-
-dnl The option for the configure script
-AC_ARG_WITH(sword-dir,
-[  --with-sword-dir=DIR     Path where Sword is being installed (default=/usr) ],
-[
-  ac_sword_dir=$withval
-],ac_sword_dir=/usr
-)
-
-AC_ARG_ENABLE(static-sword,
-[  --enable-static-sword    Link to the static Sword library],
- 	ac_static_sword="YES",
- 	[ ac_static_sword="$2" ]
-)
-
-dnl try to find Sword library files
-AC_MSG_CHECKING([for Sword library files])
-AC_REQUIRE([AC_FIND_ZLIB])
-ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
-
-if test "x$ac_static_sword" = "xYES"; then
-	SEARCH_LIBS="libsword.a";
-else
-	SEARCH_LIBS="libsword.so libsword.a";
-fi
-
-
-AC_CACHE_VAL(ac_cv_sword_libdir, AC_FIND_FILE($SEARCH_LIBS, $ac_sword_library_dirs, ac_cv_sword_libdir))
-
-if test "x$ac_cv_sword_libdir" = "xNO"; then
-  AC_MSG_ERROR(SWORD library not found. Try to use configure with --with-sword-dir=/your/SWORD/path!);
-fi
-
-if test "x$ac_static_sword" = "xYES"; then
-	LIB_SWORD="$ac_cv_sword_libdir/libsword.a";
-else
-	LIB_SWORD="-lsword";
-fi
-
-AC_SUBST(SWORD_LIBRARY_PATH)
-AC_SUBST(LIB_SWORD)
-all_libraries="$all_libraries -L$ac_cv_sword_libdir"
-
-if test "x$ac_static_sword" = "xYES"; then
-	MESSAGE="static library $ac_cv_sword_libdir/libsword.a";
-else
-	MESSAGE="$ac_cv_sword_libdir";
-fi
-AC_MSG_RESULT([$MESSAGE])
-
-dnl -- try to find Swords include files --
-AC_MSG_CHECKING([for Sword include files])
-ac_sword_include_dirs="$ac_sword_dir/include/sword $ac_sword_dir/include /usr/include/sword /usr/include /usr/local/include/sword /usr/local/include /usr/local/sword/include /usr/local/sword/include/sword"
-
-AC_CACHE_VAL(ac_cv_sword_incdir, AC_FIND_FILE(swmgr.h, $ac_sword_include_dirs, ac_cv_sword_incdir))
-
-if test "x$ac_cv_sword_incdir" = "xNO"; then
-	AC_MSG_ERROR([The Sword include file files were not found.
-Please try to use configure with --with-sword-dir=/your/SWORD/path !
-])
-fi
-
-SWORD_INCLUDES="-I$ac_cv_sword_incdir"
-AC_SUBST(SWORD_INCLUDES)
-all_includes="$all_includes -I$ac_cv_sword_incdir"
-
-AC_MSG_RESULT([$ac_cv_sword_incdir])
-
-
-
-dnl -- Sword version tests --
-dnl First test for installed Sword version
-dnl Then check if it's recent enough
-
-AC_MSG_CHECKING([for installed Sword version])
-
-AC_CACHE_VAL(ac_cv_installed_sword_version,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$"
-LDFLAGS="$LDFLAGS -L$ac_cv_sword_libdir"
-LIBS="$LIB_SWORD -lz"
-LD_LIBRARY_PATH="$ac_cv_sword_libdir"
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-cat > conftest.$ac_ext <<EOF
-#include <iostream>
-#include <swversion.h>
-
-#ifdef SWORD_NAMESPACE_START
-using namespace sword;
-#endif
-
-int main(int argc, char* argv[]) {
-	std::cout << SWVersion::currentVersion << std::endl;
-	return 0;
-}
-EOF
-
-
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-	if test -x conftest; then
-		eval ac_cv_installed_sword_version=`./conftest 2>&5`
-	fi
-else
-  echo "configure: failed program was:" >&AC_FD_CC
-  AC_MSG_ERROR([Failed to compile the test program to check the Sword version! Please have a look at config.log! Report this to the BibleTime developers!]);
-  cat conftest.$ac_ext >&AC_FD_CC
-fi
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT([$ac_cv_installed_sword_version])
-
-
-
-
-dnl *** Now check if the installed version is recent enough
-AC_MSG_CHECKING([whether your Sword installation is recent enough])
-
-AC_CACHE_VAL(ac_cv_sword_recent_version,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$"
-LDFLAGS="$LDFLAGS -L$ac_cv_sword_libdir"
-LIBS="$LIB_SWORD -lz"
-LD_LIBRARY_PATH="$ac_cv_sword_libdir"
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-cat > conftest.$ac_ext <<EOF
-#include <iostream>
-#include <swversion.h>
-
-#ifdef SWORD_NAMESPACE_START
-using namespace sword;
-#endif
-
-
-int main(int argc, char* argv[[]]) {
-	if (argc == 2) { //compare required with installed Sword version
-		const char* requiredVersion( argv[[1]] );
-		if ( (SWVersion( requiredVersion ) < SWVersion::currentVersion) || (SWVersion( requiredVersion ) == SWVersion::currentVersion) ) {
-			std::cout << "ok";
-			return -1;
-		}
-		else {
-			std::cout << "not-ok";
-			return -2; //version not recent enough
-		}
-	}
-	return 0;
-}
-EOF
-
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-	if test -x conftest; then
-		eval ac_cv_sword_recent_version=`./conftest $1 2>&5`
-	fi
-else
-  echo "configure: failed program was:" >&AC_FD_CC
-  AC_MSG_ERROR([Failed to compile the test program to check the Sword version! Please have a look at config.log! Report this to the BibleTime developers!]);
-  cat conftest.$ac_ext >&AC_FD_CC
-fi;
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_RESTORE
-])
-
-if test "x$ac_cv_sword_recent_version" = "xok"; then
-	AC_MSG_RESULT([yes]);
-elif test "x$ac_cv_sword_recent_version" = "xnot-ok"; then
-	AC_MSG_RESULT([no]);
-	AC_MSG_ERROR([Your Sword installation is not recent enought! Please upgrade to version $1! Get the Sword library at www.crosswire.org.]);
-else
-	AC_MSG_ERROR([Invalid return code of the internal Sword version test program. Please submit a bugreport!]);
-fi;
-
-])
-##	-*- autoconf -*-
-
-dnl -------------------------------------------------------------------------------
-dnl		Check wheter to use static linking, first parameter is the result (YES/NO)
-dnl -------------------------------------------------------------------------------
-AC_DEFUN(AC_CHECK_STATIC_LINKING,
-[
-$1="NO"
-
-AC_MSG_CHECKING(whether to use static linking)
-AC_ARG_ENABLE(static-linking,
-      [  --enable-static-linking	use static linking],
-      USE_STATIC_LINKING=$enableval, USE_STATIC_LINKING="no")
-
-if test "$USE_STATIC_LINKING" = "yes"; then
-	BT_LDFLAGS="-all-static -Wl,-Bstatic";
-	AC_SUBST(BT_LDFLAGS)
-	CPPFLAGS="-DSTATIC_BUILD $CPPFLAGS";
-	$1="YES";
-else
-	$1="NO";
-fi
-
-AC_MSG_RESULT($USE_STATIC_LINKING)
-])
-
-dnl -------------------------------------------------------------------------------
-dnl		Checks the type of the distribution
-dnl		Possible names for the distributions are SuSE, RedHat, Mandrake
-dnl -------------------------------------------------------------------------------
-AC_DEFUN(AC_CHECK_DISTRIBUTION,
-[
-AC_MSG_CHECKING([for the used Linux distribution])
-
-AC_ARG_WITH(distribution,
-[  --with-distribution=TYPE     The name of your *NIX distribution, e.g. SuSE [auto] ],
-[
-  ac_distribution=$withval
-],ac_distribution=auto
-)
-
-AC_ARG_WITH(distribution-version,
-[  --with-distribution-version=VERSION     Version of your *NIX distribution, e.g. 7.2 [auto] ],
-[
-  ac_distribution_version=$withval
-],ac_distribution_version=auto
-)
-
-AC_ARG_WITH(rpm-prefix,
-[  --with-rpm-prefix=DIR    The directory which should be used as PREFIX
-														in the RPM spec file [auto] ],
-[
-  ac_rpm_prefix=$withval
-],ac_rpm_prefix=auto
-)
-
-AC_ARG_WITH(rpm-group,
-[  --with-rpm-group=DIR     The group which will be used for the RPM system [auto] ],
-[
-  ac_rpm_group=$withval
-],ac_rpm_group=auto
-)
-
-if test "$ac_distribution" != "auto"; then
-	DISTRIBUTION=[$ac_distribution]
-fi
-
-if test "$ac_distribution" = "auto"; then
-AC_CACHE_VAL(DISTRIBUTION, [
-if test -f "/etc/SuSE-release"; then
-	DISTRIBUTION="SuSE"
-elif test -f "/etc/mandrake-release"; then
-	DISTRIBUTION="Mandrake"
-elif test -f "/etc/redhat-release"; then
-	DISTRIBUTION="Red Hat"
-elif test -f "/etc/debian_version"; then
-	DISTRIBUTION="Debian"
-fi
-])
-fi
-
-if test "$ac_distribution_version" != "auto"; then
-	DISTRIBUTION_VERSION=[$ac_distribution_version]
-fi
-if test "$ac_distribution_version" = "auto"; then
-AC_CACHE_VAL(DISTRIBUTION_VERSION, [
-if test -f "/etc/SuSE-release" && test "$DISTRIBUTION" = "SuSE"; then
-	DISTRIBUTION_VERSION=[`grep "VERSION =" /etc/SuSE-release | sed 's/VERSION = //'`];	
-elif test -f "/etc/mandrake-release" && test "$DISTRIBUTION" = "Mandrake"; then
-	DISTRIBUTION_VERSION=[`grep "Mandrake" /etc/mandrake-release | sed 's/[a-zA-Z()]*//g' | awk '{print $1}'`]
-elif test -f "/etc/redhat-release" && test "$DISTRIBUTION" = "Red Hat"; then
-	DISTRIBUTION_VERSION=[`grep "Red Hat" /etc/redhat-release | sed 's/[a-zA-Z()]*//g' | awk '{print $1}'`]
-elif test -f "/etc/debian_version" && test "$DISTRIBUTION" = "Debian"; then
-	DISTRIBUTION_VERSION=[`cat /etc/debian_version`]
-fi
-])
-fi
-
-
-if test "$ac_rpm_prefix" != "auto"; then
-	RPM_PREFIX=[$ac_rpm_prefix]
-fi
-if test "$ac_rpm_prefix" = "auto"; then
-AC_CACHE_VAL(RPM_PREFIX, [
-if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_PREFIX="/opt/kde3"
-elif test "$DISTRIBUTION" = "Mandrake"; then
-	RPM_PREFIX="/usr"	
-elif test "$DISTRIBUTION" = "Red Hat"; then
-	RPM_PREFIX="/usr"		
-elif test "$DISTRIBUTION" = "Debian"; then
-	RPM_PREFIX="/usr"
-fi
-])
-fi
-
-if test "$ac_rpm_group" != "auto"; then
-	RPM_GROUP=[$ac_rpm_group]
-fi
-if test "$ac_rpm_prefix" = "auto"; then
-AC_CACHE_VAL(RPM_GROUP,
-[
-if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_GROUP="X11/KDE/Applications"
-elif test "$DISTRIBUTION" = "Mandrake"; then
-	RPM_GROUP="Graphical desktop/KDE"
-elif test "$DISTRIBUTION" = "Red Hat"; then
-	RPM_GROUP="Graphical desktop/KDE"
-elif test "$DISTRIBUTION" = "Debian"; then
-	RPM_GROUP="Graphical desktop/KDE"
-fi
-])
-fi
-
-if test -n "$DISTRIBUTION" && test "$DISTRIBUTION" != "unknown"; then
-	AC_DEFINE_UNQUOTED(DISTRIBUTION, ${DISTRIBUTION}, [The type of your distribution])
-fi
-
-if test -n "$DISTRIBUTION_VERSION"  && test "$DISTRIBUTION_VERSION" != "unknown"; then
-	AC_DEFINE_UNQUOTED(DISTRIBUTION_VERSION, ${DISTRIBUTION_VERSION}, [The version of your distribution])
-fi
-
-AC_SUBST(DISTRIBUTION)
-AC_SUBST(DISTRIBUTION_VERSION)
-AC_SUBST(RPM_PREFIX)
-AC_SUBST(RPM_GROUP)
-
-AC_MSG_RESULT([$DISTRIBUTION $DISTRIBUTION_VERSION])
-
-AC_MSG_CHECKING([for RPM installation prefix])
-AC_MSG_RESULT([$RPM_PREFIX])
-
-AC_MSG_CHECKING([for the correct RPM group])
-AC_MSG_RESULT([$RPM_GROUP])
-])
-
-
-
-
-dnl MY_CURL
-dnl -------
-dnl set my_cv_curl_vers to the version of libcurl or NONE
-dnl if libcurl is not found or is too old
-dnl This function comes from cURL's webpage
-
-AC_DEFUN(AC_CHECK_CURL,[
- AC_CACHE_VAL(my_cv_curl_vers,[
- my_cv_curl_vers=NONE
- dnl check is the plain-text version of the required version
- check="7.9"
- dnl check_hex must be UPPERCASE if any hex letters are present
- check_hex="070900"
-
- AC_MSG_CHECKING([for curl >= $check])
-
- if eval curl-config --version 2>/dev/null >/dev/null; then
-   ver=`curl-config --version | sed -e "s/libcurl //g"`
-   hex_ver=`curl-config --vernum | tr 'a-f' 'A-F'`
-   ok=`echo "ibase=16; if($hex_ver>=$check_hex) $hex_ver else 0" | bc`
-
-   if test x$ok != x0; then
-     my_cv_curl_vers="$ver"
-     AC_MSG_RESULT([$my_cv_curl_vers])
-   else
-     AC_MSG_RESULT(FAILED)
-		 AC_MSG_ERROR([$ver is too old. Please install libcurl version $check or higher.]);
-   fi
- else
-   AC_MSG_RESULT(FAILED)
-   AC_MSG_ERROR([curl-config was not found. Please install libcurl version $check or higher.])
- fi
- ])
-])
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index b06fc21..0000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,12522 +0,0 @@
-# generated automatically by aclocal 1.7.6 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# 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 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.
-
-
-dnl    This file is part of the KDE libraries/packages
-dnl    Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu)
-dnl              (C) 1997,98,99 Stephan Kulow (coolo@kde.org)
-
-dnl    This file is free software; you can redistribute it and/or
-dnl    modify it under the terms of the GNU Library General Public
-dnl    License as published by the Free Software Foundation; either
-dnl    version 2 of the License, or (at your option) any later version.
-
-dnl    This library is distributed in the hope that it will be useful,
-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl    Library General Public License for more details.
-
-dnl    You should have received a copy of the GNU Library General Public License
-dnl    along with this library; see the file COPYING.LIB.  If not, write to
-dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl    Boston, MA 02111-1307, USA.
-
-dnl IMPORTANT NOTE:
-dnl Please do not modify this file unless you expect your modifications to be
-dnl carried into every other module in the repository. 
-dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
-
-# KDE_PATH_X_DIRECT
-dnl Internal subroutine of AC_PATH_X.
-dnl Set ac_x_includes and/or ac_x_libraries.
-AC_DEFUN([KDE_PATH_X_DIRECT],
-[
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-  # First, try using that file with no special directory specified.
-AC_TRY_CPP([#include <$x_direct_test_include>],
-[# We can compile using X headers with no special include directory.
-ac_x_includes=],
-[# Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done])
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
-  # Check for the libraries.
-
-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS="$LIBS"
-  LIBS="-l$x_direct_test_library $LIBS"
-AC_TRY_LINK(, [${x_direct_test_function}()],
-[LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=],
-[LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-    /usr/X11/lib${kdelibsuff}           \
-    /usr/X11R6/lib${kdelibsuff}         \
-    /usr/X11R5/lib${kdelibsuff}         \
-    /usr/X11R4/lib${kdelibsuff}         \
-                                        \
-    /usr/lib${kdelibsuff}/X11           \
-    /usr/lib${kdelibsuff}/X11R6         \
-    /usr/lib${kdelibsuff}/X11R5         \
-    /usr/lib${kdelibsuff}/X11R4         \
-                                        \
-    /usr/local/X11/lib${kdelibsuff}     \
-    /usr/local/X11R6/lib${kdelibsuff}   \
-    /usr/local/X11R5/lib${kdelibsuff}   \
-    /usr/local/X11R4/lib${kdelibsuff}   \
-                                        \
-    /usr/local/lib${kdelibsuff}/X11     \
-    /usr/local/lib${kdelibsuff}/X11R6   \
-    /usr/local/lib${kdelibsuff}/X11R5   \
-    /usr/local/lib${kdelibsuff}/X11R4   \
-                                        \
-    /usr/X386/lib${kdelibsuff}          \
-    /usr/x386/lib${kdelibsuff}          \
-    /usr/XFree86/lib${kdelibsuff}/X11   \
-                                        \
-    /usr/lib${kdelibsuff}               \
-    /usr/local/lib${kdelibsuff}         \
-    /usr/unsupported/lib${kdelibsuff}   \
-    /usr/athena/lib${kdelibsuff}        \
-    /usr/local/x11r5/lib${kdelibsuff}   \
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
-    /lib/usr/lib${kdelibsuff}/X11       \
-                                        \
-    /usr/openwin/lib${kdelibsuff}       \
-    /usr/openwin/share/lib${kdelibsuff} \
-    ; \
-do
-dnl Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done])
-fi # $ac_x_libraries = NO
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find a file (or one of more files in a list of dirs)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
-  for j in $1;
-  do
-    echo "configure: __oline__: $i/$j" >&AC_FD_CC
-    if test -r "$i/$j"; then
-      echo "taking that" >&AC_FD_CC
-      $3=$i
-      break 2
-    fi
-  done
-done
-])
-
-dnl KDE_FIND_PATH(programm-name, variable-name, list of directories,
-dnl	if-not-found, test-parameter)
-AC_DEFUN([KDE_FIND_PATH],
-[
-   AC_MSG_CHECKING([for $1])
-   if test -n "$$2"; then
-        kde_cv_path="$$2";
-   else
-        kde_cache=`echo $1 | sed 'y%./+-%__p_%'`
-
-        AC_CACHE_VAL(kde_cv_path_$kde_cache,
-        [
-        kde_cv_path="NONE"
-	dirs="$3"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/$1"; then
-	    if test -n "$5"
-	    then
-              evalstr="$dir/$1 $5 2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/$1"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/$1"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-        ])
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      AC_MSG_RESULT(not found)
-      $4
-   else
-      AC_MSG_RESULT($kde_cv_path)
-      $2=$kde_cv_path
-
-   fi
-])
-
-AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
-[
-    AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-Please check whether you installed Qt correctly.
-You need to have a running moc binary.
-configure tried to run $ac_cv_path_moc and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable MOC to the right one before running
-configure.
-])
-])
-
-AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
-[
-    AC_MSG_WARN([No Qt ui compiler (uic) found!
-Please check whether you installed Qt correctly.
-You need to have a running uic binary.
-configure tried to run $ac_cv_path_uic and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable UIC to the right one before running
-configure.
-])
-])
-
-
-AC_DEFUN([KDE_CHECK_UIC_FLAG],
-[
-    AC_MSG_CHECKING([whether uic supports -$1 ])
-    kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'`
-    AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache,
-    [
-        cat >conftest.ui <<EOT
-        <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-EOT
-        ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null"
-        if AC_TRY_EVAL(ac_uic_testrun); then
-            eval "kde_cv_prog_uic_$kde_cache=yes"
-        else
-            eval "kde_cv_prog_uic_$kde_cache=no"
-        fi
-        rm -f conftest*
-    ])
-
-    if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-        AC_MSG_RESULT([yes])
-        :
-        $3
-    else
-        AC_MSG_RESULT([no])
-        :
-        $4
-    fi
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find the meta object compiler and the ui compiler in the PATH,
-dnl in $QTDIR/bin, and some more usual places
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_QT_MOC_UIC],
-[
-   AC_REQUIRE([KDE_CHECK_PERL])
-   qt_bindirs=""
-   for dir in $kde_qt_dirs; do
-      qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
-   done
-   qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
-   if test ! "$ac_qt_bindir" = "NO"; then
-      qt_bindirs="$ac_qt_bindir $qt_bindirs"
-   fi
-
-   KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
-   if test -z "$UIC_NOT_NEEDED"; then
-     KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
-     if test -z "$UIC_PATH" ; then
-       KDE_UIC_ERROR_MESSAGE
-       exit 1
-     else
-       UIC=$UIC_PATH
-
-       if test $kde_qtver = 3; then
-         KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
-         KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
-
-         if test x$ac_uic_supports_libpath = xyes; then
-             UIC="$UIC -L \$(kde_widgetdir)"
-         fi
-         if test x$ac_uic_supports_nounload = xyes; then
-             UIC="$UIC -nounload"
-         fi
-       fi
-     fi
-   else
-     UIC="echo uic not available: "
-   fi
-
-   AC_SUBST(MOC)
-   AC_SUBST(UIC)
-
-   UIC_TR="i18n"
-   if test $kde_qtver = 3; then
-     UIC_TR="tr2i18n"
-   fi
-
-   AC_SUBST(UIC_TR)
-])
-
-AC_DEFUN([KDE_1_CHECK_PATHS],
-[
-  KDE_1_CHECK_PATH_HEADERS
-
-  KDE_TEST_RPATH=
-
-  if test -n "$USE_RPATH"; then
-
-     if test -n "$kde_libraries"; then
-       KDE_TEST_RPATH="-R $kde_libraries"
-     fi
-
-     if test -n "$qt_libraries"; then
-       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-     fi
-
-     if test -n "$x_libraries"; then
-       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-     fi
-
-     KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-  fi
-
-AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_ERROR([your system fails at linking a small KDE application!
-Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
-For more details about this problem, look at the end of config.log.])
-fi
-
-if eval `KDEDIR= ./conftest 2>&5`; then
-  kde_result=done
-else
-  kde_result=problems
-fi
-
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-kde_have_all_paths=yes
-
-KDE_SET_PATHS($kde_result)
-
-])
-
-AC_DEFUN([KDE_SET_PATHS],
-[
-  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-	kde_htmldir=\"$kde_htmldir\" \
-	kde_appsdir=\"$kde_appsdir\" \
-	kde_icondir=\"$kde_icondir\" \
-	kde_sounddir=\"$kde_sounddir\" \
-	kde_datadir=\"$kde_datadir\" \
-	kde_locale=\"$kde_locale\" \
-	kde_cgidir=\"$kde_cgidir\" \
-	kde_confdir=\"$kde_confdir\" \
-	kde_kcfgdir=\"$kde_kcfgdir\" \
-	kde_mimedir=\"$kde_mimedir\" \
-	kde_toolbardir=\"$kde_toolbardir\" \
-	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-	kde_templatesdir=\"$kde_templatesdir\" \
-	kde_bindir=\"$kde_bindir\" \
-	kde_servicesdir=\"$kde_servicesdir\" \
-	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-	kde_moduledir=\"$kde_moduledir\" \
-	kde_styledir=\"$kde_styledir\" \
-	kde_widgetdir=\"$kde_widgetdir\" \
-	xdg_appsdir=\"$xdg_appsdir\" \
-	xdg_menudir=\"$xdg_menudir\" \
-	xdg_directorydir=\"$xdg_directorydir\" \
-	kde_result=$1"
-])
-
-AC_DEFUN([KDE_SET_DEFAULT_PATHS],
-[
-if test "$1" = "default"; then
-
-  if test -z "$kde_htmldir"; then
-    kde_htmldir='\${datadir}/doc/HTML'
-  fi
-  if test -z "$kde_appsdir"; then
-    kde_appsdir='\${datadir}/applnk'
-  fi
-  if test -z "$kde_icondir"; then
-    kde_icondir='\${datadir}/icons'
-  fi
-  if test -z "$kde_sounddir"; then
-    kde_sounddir='\${datadir}/sounds'
-  fi
-  if test -z "$kde_datadir"; then
-    kde_datadir='\${datadir}/apps'
-  fi
-  if test -z "$kde_locale"; then
-    kde_locale='\${datadir}/locale'
-  fi
-  if test -z "$kde_cgidir"; then
-    kde_cgidir='\${exec_prefix}/cgi-bin'
-  fi
-  if test -z "$kde_confdir"; then
-    kde_confdir='\${datadir}/config'
-  fi
-  if test -z "$kde_kcfgdir"; then
-    kde_kcfgdir='\${datadir}/config.kcfg'
-  fi
-  if test -z "$kde_mimedir"; then
-    kde_mimedir='\${datadir}/mimelnk'
-  fi
-  if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${datadir}/toolbar'
-  fi
-  if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${datadir}/wallpapers'
-  fi
-  if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${datadir}/templates'
-  fi
-  if test -z "$kde_bindir"; then
-    kde_bindir='\${exec_prefix}/bin'
-  fi
-  if test -z "$kde_servicesdir"; then
-    kde_servicesdir='\${datadir}/services'
-  fi
-  if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${datadir}/servicetypes'
-  fi
-  if test -z "$kde_moduledir"; then
-    if test "$kde_qtver" = "2"; then
-      kde_moduledir='\${libdir}/kde2'
-    else
-      kde_moduledir='\${libdir}/kde3'
-    fi
-  fi
-  if test -z "$kde_styledir"; then
-    kde_styledir='\${libdir}/kde3/plugins/styles'
-  fi
-  if test -z "$kde_widgetdir"; then
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
-  fi
-  if test -z "$xdg_appsdir"; then
-    xdg_appsdir='\${datadir}/applications/kde'
-  fi
-  if test -z "$xdg_menudir"; then
-    xdg_menudir='\${sysconfdir}/xdg/menus'
-  fi
-  if test -z "$xdg_directorydir"; then
-    xdg_directorydir='\${datadir}/desktop-directories'
-  fi
-
-  KDE_SET_PATHS(defaults)
-
-else
-
-  if test $kde_qtver = 1; then
-     AC_MSG_RESULT([compiling])
-     KDE_1_CHECK_PATHS
-  else
-     AC_MSG_ERROR([path checking not yet supported for KDE 2])
-  fi
-
-fi
-])
-
-AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS],
-[ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-   test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-   test -z "$kde_datadir" || test -z "$kde_locale"  ||
-   test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
-   test -z "$kde_kcfgdir" ||
-   test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-   test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-   test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-   test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-   test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-   test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-   test "x$kde_have_all_paths" != "xyes"; then
-     kde_have_all_paths=no
-  fi
-])
-
-AC_DEFUN([KDE_MISSING_PROG_ERROR],
-[
-    AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed KDE correctly.
-])
-])
-
-AC_DEFUN([KDE_MISSING_ARTS_ERROR],
-[
-    AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed aRts correctly or use
---without-arts to compile without aRts support (this will remove functionality).
-])
-])
-
-AC_DEFUN([KDE_SUBST_PROGRAMS],
-[
-    AC_ARG_WITH(arts,
-        AC_HELP_STRING([--without-arts],[build without aRts [default=yes]]),
-        [build_arts=$withval],
-        [build_arts=yes]
-    )
-    AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
-
-        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-        test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-        if test -n "$KDEDIRS"; then
-           kde_save_IFS=$IFS
-           IFS=:
-           for dir in $KDEDIRS; do
-                kde_default_bindirs="$dir/bin $kde_default_bindirs "
-           done
-           IFS=$kde_save_IFS
-        fi
-        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
-        KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
-        KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
-        if test "$build_arts" != "no"; then
-          KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
-          KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
-        fi
-        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
-        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-
-        kde32ornewer=1
-        if test "$kde_qtver" -lt 3; then
-            kde32ornewer=
-        else
-            if test "$kde_qtver" = "3" && test "$kde_qtsubver" -le 1; then
-                kde32ornewer=
-            fi
-        fi
-
-        if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
-            KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
-        fi
-        KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
-
-        if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
-            AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
-	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
-		KDE_XSL_STYLESHEET=""
-	    else
-                KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl"
-	    fi
-        fi
-
-        DCOP_DEPENDENCIES='$(DCOPIDL)'
-        if test -n "$kde32ornewer"; then
-            KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
-            DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
-            AC_SUBST(KCONFIG_COMPILER)
-            AC_SUBST(KCFG_DEPENDENCIES)
-            AC_SUBST(DCOPIDLNG)
-        fi
-        AC_SUBST(DCOPIDL)
-        AC_SUBST(DCOPIDL2CPP)
-        AC_SUBST(DCOP_DEPENDENCIES)
-        AC_SUBST(MCOPIDL)
-        AC_SUBST(ARTSCCONFIG)
-        AC_SUBST(KDECONFIG)
-	AC_SUBST(MEINPROC)
- 	AC_SUBST(KDE_XSL_STYLESHEET)
-	AC_SUBST(XMLLINT)
-
-        if test -x "$KDECONFIG"; then # it can be "compiled"
-          kde_libs_prefix=`$KDECONFIG --prefix`
-          if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-               AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
-                          This means it has been moved since you installed it.
-                          This won't work. Please recompile kdelibs for the new prefix.
-                          ])
-           fi
-           kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-        else
-           kde_libs_prefix='$(prefix)'
-           kde_libs_htmldir='$(kde_htmldir)'
-        fi
-        AC_SUBST(kde_libs_prefix)
-        AC_SUBST(kde_libs_htmldir)
-])dnl
-
-AC_DEFUN([AC_CREATE_KFSSTND],
-[
-AC_REQUIRE([AC_CHECK_RPATH])
-
-AC_MSG_CHECKING([for KDE paths])
-kde_result=""
-kde_cached_paths=yes
-AC_CACHE_VAL(kde_cv_all_paths,
-[
-  KDE_SET_DEFAULT_PATHS($1)
-  kde_cached_paths=no
-])
-eval "$kde_cv_all_paths"
-KDE_CHECK_PATHS_FOR_COMPLETENESS
-if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
-  # wrong values were cached, may be, we can set better ones
-  kde_result=
-  kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
-  kde_datadir= kde_locale=  kde_cgidir=  kde_confdir= kde_kcfgdir=
-  kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-  kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-  kde_have_all_paths=
-  kde_styledir=
-  kde_widgetdir=
-  xdg_appsdir = xdg_menudir= xdg_directorydir= 
-  KDE_SET_DEFAULT_PATHS($1)
-  eval "$kde_cv_all_paths"
-  KDE_CHECK_PATHS_FOR_COMPLETENESS
-  kde_result="$kde_result (cache overridden)"
-fi
-if test "$kde_have_all_paths" = "no"; then
-  AC_MSG_ERROR([configure could not run a little KDE program to test the environment.
-Since it had compiled and linked before, it must be a strange problem on your system.
-Look at config.log for details. If you are not able to fix this, look at
-http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-(If you're using an egcs version on Linux, you may update binutils!)
-])
-else
-  rm -f conftest*
-  AC_MSG_RESULT($kde_result)
-fi
-
-bindir=$kde_bindir
-
-KDE_SUBST_PROGRAMS
-
-])
-
-AC_DEFUN([AC_SUBST_KFSSTND],
-[
-AC_SUBST(kde_htmldir)
-AC_SUBST(kde_appsdir)
-AC_SUBST(kde_icondir)
-AC_SUBST(kde_sounddir)
-AC_SUBST(kde_datadir)
-AC_SUBST(kde_locale)
-AC_SUBST(kde_confdir)
-AC_SUBST(kde_kcfgdir)
-AC_SUBST(kde_mimedir)
-AC_SUBST(kde_wallpaperdir)
-AC_SUBST(kde_bindir)
-dnl X Desktop Group standards
-AC_SUBST(xdg_appsdir)
-AC_SUBST(xdg_menudir)
-AC_SUBST(xdg_directorydir)
-dnl for KDE 2
-AC_SUBST(kde_templatesdir)
-AC_SUBST(kde_servicesdir)
-AC_SUBST(kde_servicetypesdir)
-AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
-AC_SUBST(kde_styledir)
-AC_SUBST(kde_widgetdir)
-if test "$kde_qtver" = 1; then
-  kde_minidir="$kde_icondir/mini"
-else
-# for KDE 1 - this breaks KDE2 apps using minidir, but
-# that's the plan ;-/
-  kde_minidir="/dev/null"
-fi
-dnl AC_SUBST(kde_minidir)
-dnl AC_SUBST(kde_cgidir)
-dnl AC_SUBST(kde_toolbardir)
-])
-
-AC_DEFUN([KDE_MISC_TESTS],
-[
-   dnl Checks for libraries.
-   AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD 
-   AC_SUBST(LIBUTIL)
-   AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD
-   AC_SUBST(LIBCOMPAT)
-   kde_have_crypt=
-   AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes],
-      AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [
-        AC_MSG_WARN([you have no crypt in either libcrypt or libc.
-You should install libcrypt from another source or configure with PAM
-support])
-	kde_have_crypt=no
-      ]))
-   AC_SUBST(LIBCRYPT)
-   if test $kde_have_crypt = yes; then
-      AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
-   fi
-   AC_CHECK_SOCKLEN_T
-   AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
-   if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      AC_CHECK_LIB(dnet_stub, dnet_ntoa,
-        [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
-   fi
-   AC_CHECK_FUNC(inet_ntoa)
-   if test $ac_cv_func_inet_ntoa = no; then
-     AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
-   fi
-   AC_CHECK_FUNC(connect)
-   if test $ac_cv_func_connect = no; then
-      AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
-        $X_EXTRA_LIBS)
-   fi
-
-   AC_CHECK_FUNC(remove)
-   if test $ac_cv_func_remove = no; then
-      AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
-   fi
-
-   # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-   AC_CHECK_FUNC(shmat, ,
-     AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
-   
-   # more headers that need to be explicitly included on darwin
-   AC_CHECK_HEADERS(sys/types.h stdint.h)
-
-   # darwin requires a poll emulation library
-   AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
-
-   # CoreAudio framework
-   AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
-     AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
-     FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
-   ])
-
-   AC_CHECK_RES_INIT
-   AC_SUBST(LIB_POLL)
-   AC_SUBST(FRAMEWORK_COREAUDIO)
-   LIBSOCKET="$X_EXTRA_LIBS"
-   AC_SUBST(LIBSOCKET)
-   AC_SUBST(X_EXTRA_LIBS)
-   AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
-   AC_SUBST(LIBUCB)
-
-   case $host in  dnl this *is* LynxOS specific
-   *-*-lynxos* )
-        AC_MSG_CHECKING([LynxOS header file wrappers])
-        [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"]
-        AC_MSG_RESULT(disabled)
-        AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS
-         ;;
-    esac
-
-   KDE_CHECK_TYPES
-   KDE_CHECK_LIBDL
-   KDE_CHECK_STRLCPY
-
-# darwin needs this to initialize the environment
-AC_CHECK_HEADERS(crt_externs.h)
-AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])])
- 
-AH_VERBATIM(_DARWIN_ENVIRON,
-[
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-])
-
-AH_VERBATIM(_AIX_STRINGS_H_BZERO,
-[
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-])
-
-AC_CHECK_FUNCS([vsnprintf snprintf])
-
-AH_VERBATIM(_TRU64,[
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-])
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Find the header files and libraries for X-Windows. Extended the
-dnl macro AC_PATH_X
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([K_PATH_X],
-[
-AC_REQUIRE([KDE_MISC_TESTS])dnl
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_ARG_ENABLE(
-  embedded,
-  AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]),
-  kde_use_qt_emb=$enableval,
-  kde_use_qt_emb=no
-)
-
-AC_ARG_ENABLE(
-  qtopia,
-  AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]),
-  kde_use_qt_emb_palm=$enableval,
-  kde_use_qt_emb_palm=no
-)
-
-AC_ARG_ENABLE(
-  mac,
-  AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]),
-  kde_use_qt_mac=$enableval,
-  kde_use_qt_mac=no
-)
-
-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-
-AC_MSG_CHECKING(for X)
-
-AC_CACHE_VAL(kde_cv_have_x,
-[# One or both of the vars are not set, and there is no cached value.
-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-   kde_x_includes=NO
-else
-   kde_x_includes=$x_includes
-fi
-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-   kde_x_libraries=NO
-else
-   kde_x_libraries=$x_libraries
-fi
-
-# below we use the standard autoconf calls
-ac_x_libraries=$kde_x_libraries
-ac_x_includes=$kde_x_includes
-
-KDE_PATH_X_DIRECT
-dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries.
-dnl Unfortunately, if compiling with the N32 ABI, this is not the correct
-dnl location. The correct location is /usr/lib32 or an undefined value
-dnl (the linker is smart enough to pick the correct default library).
-dnl Things work just fine if you use just AC_PATH_X_DIRECT.
-dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to
-dnl /usr/openwin/include, which doesn't work. /usr/include does work, so
-dnl x_includes should be left alone.
-case "$host" in
-mips-sgi-irix6*)
-  ;;
-*-*-solaris*)
-  ;;
-*)
-  _AC_PATH_X_XMKMF
-  if test -z "$ac_x_includes"; then
-    ac_x_includes="."
-  fi
-  if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib${kdelibsuff}"
-  fi
-esac
-#from now on we use our own again
-
-# when the user already gave --x-includes, we ignore
-# what the standard autoconf macros told us.
-if test "$kde_x_includes" = NO; then
-  kde_x_includes=$ac_x_includes
-fi
-
-# for --x-libraries too
-if test "$kde_x_libraries" = NO; then
-  kde_x_libraries=$ac_x_libraries
-fi
-
-if test "$kde_x_includes" = NO; then
-  AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!])
-fi
-
-if test "$kde_x_libraries" = NO; then
-  AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!])
-fi
-
-# Record where we found X for the cache.
-kde_cv_have_x="have_x=yes \
-         kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-])dnl
-
-eval "$kde_cv_have_x"
-
-if test "$have_x" != yes; then
-  AC_MSG_RESULT($have_x)
-  no_x=yes
-else
-  AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes])
-fi
-
-if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-  X_INCLUDES=""
-  x_includes="."; dnl better than nothing :-
- else
-  x_includes=$kde_x_includes
-  X_INCLUDES="-I$x_includes"
-fi
-
-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
-  X_LDFLAGS=""
-  x_libraries="/usr/lib"; dnl better than nothing :-
- else
-  x_libraries=$kde_x_libraries
-  X_LDFLAGS="-L$x_libraries"
-fi
-all_includes="$X_INCLUDES"
-all_libraries="$X_LDFLAGS"
-
-# Check for libraries that X11R6 Xt/Xaw programs need.
-ac_save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-# check for ICE first), but we must link in the order -lSM -lICE or
-# we get undefined symbols.  So assume we have SM if we have ICE.
-# These have to be linked with before -lX11, unlike the other
-# libraries we check for below, so use a different variable.
-#  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-AC_CHECK_LIB(ICE, IceConnectionNumber,
-  [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS)
-LDFLAGS="$ac_save_LDFLAGS"
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-
-AC_MSG_CHECKING(for libXext)
-AC_CACHE_VAL(kde_cv_have_libXext,
-[
-kde_ldflags_safe="$LDFLAGS"
-kde_libs_safe="$LIBS"
-
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-LIBS="-lXext -lX11 $LIBSOCKET"
-
-AC_TRY_LINK([
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-],
-[
-printf("hello Xext\n");
-],
-kde_cv_have_libXext=yes,
-kde_cv_have_libXext=no
-)
-
-LDFLAGS=$kde_ldflags_safe
-LIBS=$kde_libs_safe
-])
-
-AC_MSG_RESULT($kde_cv_have_libXext)
-
-if test "$kde_cv_have_libXext" = "no"; then
-  AC_MSG_ERROR([We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either.])
-fi
-
-LIB_XEXT="-lXext"
-QTE_NORTTI=""
-
-elif test "$kde_use_qt_emb" = "yes"; then
-  dnl We're using QT Embedded
-  CPPFLAGS=-DQWS
-  CXXFLAGS="$CXXFLAGS -fno-rtti"
-  QTE_NORTTI="-fno-rtti -DQWS"
-  X_PRE_LIBS=""
-  LIB_X11=""
-  LIB_XEXT=""
-  LIB_XRENDER=""
-  LIBSM=""
-  X_INCLUDES=""
-  X_LDFLAGS=""
-  x_includes=""
-  x_libraries=""
-elif test "$kde_use_qt_mac" = "yes"; then
-  dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
-  dnl be included to get the information) --Sam
-  CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
-  CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
-  X_PRE_LIBS=""
-  LIB_X11=""
-  LIB_XEXT=""
-  LIB_XRENDER=""
-  LIBSM=""
-  X_INCLUDES=""
-  X_LDFLAGS=""
-  x_includes=""
-  x_libraries=""
-fi
-AC_SUBST(X_PRE_LIBS)
-AC_SUBST(LIB_X11)
-AC_SUBST(LIB_XRENDER)
-AC_SUBST(LIBSM)
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_includes)
-AC_SUBST(x_libraries)
-AC_SUBST(QTE_NORTTI)
-AC_SUBST(LIB_XEXT)
-
-])
-
-AC_DEFUN([KDE_PRINT_QT_PROGRAM],
-[
-AC_REQUIRE([KDE_USE_QT])
-cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qglobal.h>
-#include <qapplication.h>
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
-EOF
-
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
-#error 1
-#endif
-EOF
-fi
-fi
-
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qcursor.h>
-#include <qstylefactory.h>
-#include <private/qucomextra_p.h>
-EOF
-fi
-
-echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-cat >> conftest.$ac_ext <<EOF
-#error 1
-#endif
-
-int main() {
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-    QStringList *t = new QStringList();
-    Q_UNUSED(t);
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-    QString s;
-    s.setLatin1("Elvis is alive", 14);
-EOF
-fi
-fi
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-    (void)QStyleFactory::create(QString::null);
-    QCursor c(Qt::WhatsThisCursor);
-EOF
-fi
-cat >> conftest.$ac_ext <<EOF
-    return 0;
-}
-EOF
-])
-
-AC_DEFUN([KDE_USE_QT],
-[
-if test -z "$1"; then
-  # Current default Qt version: 3.2
-  kde_qtver=3
-  kde_qtsubver=2
-else
-  kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
-  # following is the check if subversion isnt found in passed argument
-  if test "$kde_qtsubver" = "$1"; then
-    kde_qtsubver=1
-  fi
-  kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
-  if test "$kde_qtver" = "1"; then
-    kde_qtsubver=42
-  fi
-fi
-
-if test -z "$2"; then
-  if test "$kde_qtver" = "2"; then
-    if test $kde_qtsubver -gt 0; then
-      kde_qt_minversion=">= Qt 2.2.2"
-    else
-      kde_qt_minversion=">= Qt 2.0.2"
-    fi
-  fi
-  if test "$kde_qtver" = "3"; then
-    if test $kde_qtsubver -gt 0; then
-	 if test $kde_qtsubver -gt 1; then
-	    kde_qt_minversion=">= Qt 3.2"
-	 else
-            kde_qt_minversion=">= Qt 3.1 (20021021)"
-         fi
-    else
-      kde_qt_minversion=">= Qt 3.0"
-    fi
-  fi
-  if test "$kde_qtver" = "1"; then
-    kde_qt_minversion=">= 1.42 and < 2.0"
-  fi
-else
-   kde_qt_minversion="$2"
-fi
-
-if test -z "$3"; then
-   if test $kde_qtver = 3; then
-     if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 0x03@VER@00"
-       qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
-       kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
-     else
-       kde_qt_verstring="QT_VERSION >= 300"
-     fi
-   fi
-   if test $kde_qtver = 2; then
-     if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 222"
-     else
-       kde_qt_verstring="QT_VERSION >= 200"
-     fi
-   fi
-   if test $kde_qtver = 1; then
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-   fi
-else
-   kde_qt_verstring="$3"
-fi
-
-if test $kde_qtver = 3; then
-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
-fi
-if test $kde_qtver = 2; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-fi
-if test $kde_qtver = 1; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt"
-fi
-])
-
-AC_DEFUN([KDE_CHECK_QT_DIRECT],
-[
-AC_REQUIRE([KDE_USE_QT])
-AC_MSG_CHECKING([if Qt compiles without flags])
-AC_CACHE_VAL(kde_cv_qt_direct,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_includes"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-else
-LIBS="$LIBQT $LIBSOCKET"
-fi
-LD_LIBRARY_PATH=
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-KDE_PRINT_QT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-  kde_cv_qt_direct="yes"
-else
-  kde_cv_qt_direct="no"
-  echo "configure: failed program was:" >&AC_FD_CC
-  cat conftest.$ac_ext >&AC_FD_CC
-fi
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_RESTORE
-])
-
-if test "$kde_cv_qt_direct" = "yes"; then
-  AC_MSG_RESULT(yes)
-  $1
-else
-  AC_MSG_RESULT(no)
-  $2
-fi
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the Qt headers and libraries.
-dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_QT_1_3],
-[
-AC_REQUIRE([K_PATH_X])
-AC_REQUIRE([KDE_USE_QT])
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-dnl ------------------------------------------------------------------------
-dnl Add configure flag to enable linking to MT version of Qt library.
-dnl ------------------------------------------------------------------------
-
-AC_ARG_ENABLE(
-  mt,
-  AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
-  kde_use_qt_mt=$enableval,
-  [
-    if test $kde_qtver = 3; then
-      kde_use_qt_mt=yes
-    else
-      kde_use_qt_mt=no
-    fi
-  ]
-)
-
-USING_QT_MT=""
-
-dnl ------------------------------------------------------------------------
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
-dnl ------------------------------------------------------------------------
-
-KDE_MT_LDFLAGS=
-KDE_MT_LIBS=
-if test "x$kde_use_qt_mt" = "xyes"; then
-  KDE_CHECK_THREADING
-  if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
-    KDE_MT_LDFLAGS="$USE_THREADS"
-    KDE_MT_LIBS="$LIBPTHREAD"
-  else
-    kde_use_qt_mt=no
-  fi
-fi
-AC_SUBST(KDE_MT_LDFLAGS)
-AC_SUBST(KDE_MT_LIBS)
-
-kde_qt_was_given=yes
-
-dnl ------------------------------------------------------------------------
-dnl If we haven't been told how to link to Qt, we work it out for ourselves.
-dnl ------------------------------------------------------------------------
-if test -z "$LIBQT_GLOB"; then
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    LIBQT_GLOB="libqte.*"
-  else
-    LIBQT_GLOB="libqt.*"
-  fi
-fi
-
-if test -z "$LIBQT"; then
-dnl ------------------------------------------------------------
-dnl If we got --enable-embedded then adjust the Qt library name.
-dnl ------------------------------------------------------------
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    qtlib="qte"
-  else
-    qtlib="qt"
-  fi
-
-  kde_int_qt="-l$qtlib"
-else
-  kde_int_qt="$LIBQT"
-  kde_lib_qt_set=yes
-fi
-
-if test -z "$LIBQPE"; then
-dnl ------------------------------------------------------------
-dnl If we got --enable-palmtop then add -lqpe to the link line
-dnl ------------------------------------------------------------
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    if test "x$kde_use_qt_emb_palm" = "xyes"; then
-      LIB_QPE="-lqpe"
-    else
-      LIB_QPE=""
-    fi
-  else
-    LIB_QPE=""
-  fi
-fi
-
-dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
-dnl ------------------------------------------------------------------------
-
-if test "x$kde_use_qt_mt" = "xyes"; then
-  if test -z "$LIBQT"; then
-    LIBQT="-l$qtlib-mt"
-    kde_int_qt="-l$qtlib-mt"
-  else
-    LIBQT="$qtlib-mt"
-    kde_int_qt="$qtlib-mt"
-  fi
-  LIBQT_GLOB="lib$qtlib-mt.*"
-  USING_QT_MT="using -mt"
-else
-  LIBQT="-l$qtlib"
-fi
-
-if test $kde_qtver != 1; then
-
-  AC_REQUIRE([AC_FIND_PNG])
-  AC_REQUIRE([AC_FIND_JPEG])
-  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-fi
-
-if test $kde_qtver = 3; then
-  AC_REQUIRE([KDE_CHECK_LIBDL])
-  LIBQT="$LIBQT $LIBDL"
-fi
-
-AC_MSG_CHECKING([for Qt])
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-fi
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-qt_libraries=""
-qt_includes=""
-AC_ARG_WITH(qt-dir,
-    AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
-    [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
-       ac_qt_bindir="$withval"/bin
-    ])
-
-AC_ARG_WITH(qt-includes,
-    AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
-    [
-       ac_qt_includes="$withval"
-    ])
-
-kde_qt_libs_given=no
-
-AC_ARG_WITH(qt-libraries,
-    AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
-    [  ac_qt_libraries="$withval"
-       kde_qt_libs_given=yes
-    ])
-
-AC_CACHE_VAL(ac_cv_have_qt,
-[#try to guess Qt locations
-
-qt_incdirs=""
-for dir in $kde_qt_dirs; do
-   qt_incdirs="$qt_incdirs $dir/include $dir"
-done
-qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
-if test ! "$ac_qt_includes" = "NO"; then
-   qt_incdirs="$ac_qt_includes $qt_incdirs"
-fi
-
-if test "$kde_qtver" != "1"; then
-  kde_qt_header=qstyle.h
-else
-  kde_qt_header=qglobal.h
-fi
-
-AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
-ac_qt_includes="$qt_incdir"
-
-qt_libdirs=""
-for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
-done
-qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
-if test ! "$ac_qt_libraries" = "NO"; then
-  qt_libdir=$ac_qt_libraries
-else
-  qt_libdirs="$ac_qt_libraries $qt_libdirs"
-  # if the Qt was given, the chance is too big that libqt.* doesn't exist
-  qt_libdir=NONE
-  for dir in $qt_libdirs; do
-    try="ls -1 $dir/${LIBQT_GLOB}"
-    if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-  done
-fi
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-  if test -e "$a"; then
-    LIBQT="$LIBQT ${kde_int_qt}_incremental"
-    break
-  fi
-done
-
-ac_qt_libraries="$qt_libdir"
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
-
-KDE_PRINT_QT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-  rm -f conftest*
-else
-  echo "configure: failed program was:" >&AC_FD_CC
-  cat conftest.$ac_ext >&AC_FD_CC
-  ac_qt_libraries="NO"
-fi
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-AC_LANG_RESTORE
-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
-  ac_cv_have_qt="have_qt=no"
-  ac_qt_notfound=""
-  missing_qt_mt=""
-  if test "$ac_qt_includes" = NO; then
-    if test "$ac_qt_libraries" = NO; then
-      ac_qt_notfound="(headers and libraries)";
-    else
-      ac_qt_notfound="(headers)";
-    fi
-  else
-    if test "x$kde_use_qt_mt" = "xyes"; then
-       missing_qt_mt="
-Make sure that you have compiled Qt with thread support!"
-       ac_qt_notfound="(library $qtlib-mt)";
-    else
-       ac_qt_notfound="(library $qtlib)";
-    fi
-  fi
-
-  AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-For more details about this problem, look at the end of config.log.$missing_qt_mt])
-else
-  have_qt="yes"
-fi
-])
-
-eval "$ac_cv_have_qt"
-
-if test "$have_qt" != yes; then
-  AC_MSG_RESULT([$have_qt]);
-else
-  ac_cv_have_qt="have_qt=yes \
-    ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
-  AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT])
-
-  qt_libraries="$ac_qt_libraries"
-  qt_includes="$ac_qt_includes"
-fi
-
-if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
-     KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
-fi
-
-AC_SUBST(qt_libraries)
-AC_SUBST(qt_includes)
-
-if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
-else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
-fi
-
-if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
- QT_LDFLAGS=""
-else
- QT_LDFLAGS="-L$qt_libraries"
- all_libraries="$all_libraries $QT_LDFLAGS"
-fi
-test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-
-AC_SUBST(QT_INCLUDES)
-AC_SUBST(QT_LDFLAGS)
-AC_PATH_QT_MOC_UIC
-
-KDE_CHECK_QT_JPEG
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
-else
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
-fi
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-  if test -e "$a"; then
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
-     break
-  fi
-done
-
-AC_SUBST(LIB_QT)
-AC_SUBST(LIB_QPE)
-
-AC_SUBST(kde_qtver)
-])
-
-AC_DEFUN([AC_PATH_QT],
-[
-AC_PATH_QT_1_3
-])
-
-AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
-[
-AC_REQUIRE([AC_PATH_QT_MOC_UIC])
-
-if test x$ac_uic_supports_libpath = xyes; then
-
-AC_MSG_CHECKING([if UIC has KDE plugins available])
-AC_CACHE_VAL(kde_cv_uic_plugins,
-[
-cat > actest.ui << EOF
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>NewConnectionDialog</class>
-<widget class="QDialog">
-   <widget class="KLineEdit">
-        <property name="name">
-           <cstring>testInput</cstring>
-        </property>
-   </widget>
-</widget>
-</UI>
-EOF
-       
-
-
-kde_cv_uic_plugins=no
-kde_line="$UIC_PATH -L $kde_widgetdir"
-if test x$ac_uic_supports_nounload = xyes; then
-   kde_line="$kde_line -nounload"
-fi
-kde_line="$kde_line -impl actest.h actest.ui > actest.cpp"
-if AC_TRY_EVAL(kde_line); then
-	# if you're trying to debug this check and think it's incorrect,
-	# better check your installation. The check _is_ correct - your
-	# installation is not.
-	if test -f actest.cpp && grep -i klineedit actest.cpp > /dev/null; then
-		kde_cv_uic_plugins=yes
-	fi
-fi
-rm -f actest.ui actest.cpp
-])
-
-AC_MSG_RESULT([$kde_cv_uic_plugins])
-if test "$kde_cv_uic_plugins" != yes; then
-	AC_MSG_ERROR([you need to install kdelibs first.])
-fi
-fi
-])
-
-AC_DEFUN([KDE_CHECK_FINAL],
-[
-  AC_ARG_ENABLE(final,
-	AC_HELP_STRING([--enable-final],
-		       [build size optimized apps (experimental - needs lots of memory)]),
-	kde_use_final=$enableval, kde_use_final=no)
-
-  if test "x$kde_use_final" = "xyes"; then
-      KDE_USE_FINAL_TRUE=""
-      KDE_USE_FINAL_FALSE="#"
-   else
-      KDE_USE_FINAL_TRUE="#"
-      KDE_USE_FINAL_FALSE=""
-  fi
-  AC_SUBST(KDE_USE_FINAL_TRUE)
-  AC_SUBST(KDE_USE_FINAL_FALSE)
-])
-
-AC_DEFUN([KDE_CHECK_CLOSURE],
-[
-  AC_ARG_ENABLE(closure,
-		AC_HELP_STRING([--enable-closure],[delay template instantiation]),
-  	kde_use_closure=$enableval, kde_use_closure=no)
-
-  KDE_NO_UNDEFINED=""
-  if test "x$kde_use_closure" = "xyes"; then
-       KDE_USE_CLOSURE_TRUE=""
-       KDE_USE_CLOSURE_FALSE="#"
-#       CXXFLAGS="$CXXFLAGS $REPO"
-  else
-       KDE_USE_CLOSURE_TRUE="#"
-       KDE_USE_CLOSURE_FALSE=""
-       KDE_NO_UNDEFINED=""
-       case $host in 
-         *-*-linux-gnu)
-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-		[KDE_NO_UNDEFINED=""])],
-	    [KDE_NO_UNDEFINED=""])
-           ;;
-       esac
-  fi
-  AC_SUBST(KDE_USE_CLOSURE_TRUE)
-  AC_SUBST(KDE_USE_CLOSURE_FALSE)
-  AC_SUBST(KDE_NO_UNDEFINED)
-])
-
-AC_DEFUN([KDE_CHECK_NMCHECK],
-[
-  AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]),
-	kde_use_nmcheck=$enableval, kde_use_nmcheck=no)
-
-  if test "$kde_use_nmcheck" = "yes"; then
-      KDE_USE_NMCHECK_TRUE=""
-      KDE_USE_NMCHECK_FALSE="#"
-   else
-      KDE_USE_NMCHECK_TRUE="#"
-      KDE_USE_NMCHECK_FALSE=""
-  fi
-  AC_SUBST(KDE_USE_NMCHECK_TRUE)
-  AC_SUBST(KDE_USE_NMCHECK_FALSE)
-])
-
-AC_DEFUN([KDE_EXPAND_MAKEVAR], [
-savex=$exec_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-tmp=$$2
-while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done
-exec_prefix=$savex
-])
-
-dnl ------------------------------------------------------------------------
-dnl Now, the same with KDE
-dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed)
-dnl and $(kde_includes) will be the kdehdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_BASE_PATH_KDE],
-[
-AC_REQUIRE([KDE_CHECK_STL])
-AC_REQUIRE([AC_PATH_QT])dnl
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_CHECK_RPATH
-AC_MSG_CHECKING([for KDE])
-
-if test "${prefix}" != NONE; then
-  kde_includes=${includedir}
-  KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
-
-  kde_libraries=${libdir}
-  KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
-
-else
-  ac_kde_includes=
-  ac_kde_libraries=
-  kde_libraries=""
-  kde_includes=""
-fi
-
-AC_CACHE_VAL(ac_cv_have_kde,
-[#try to guess kde locations
-
-if test "$kde_qtver" = 1; then
-  kde_check_header="ksock.h"
-  kde_check_lib="libkdecore.la"
-else
-  kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
-fi
-
-if test -z "$1"; then
-
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
-kde_incdirs="$ac_kde_includes $kde_incdirs"
-AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
-ac_kde_includes="$kde_incdir"
-
-if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
-  AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE headers installed. This will fail.
-So, check this please and use another prefix!])
-fi
-
-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
-AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-ac_kde_libraries="$kde_libdir"
-
-kde_widgetdir=NO
-dnl this might be somewhere else
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
-
-if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-So, check this please and use another prefix!])
-fi
-
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-AC_MSG_ERROR([
-I can't find the designer plugins. These are required and should have been installed
-by kdelibs])
-fi
-
-if test -n "$kde_widgetdir"; then
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
-fi
-
-
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then
-  ac_cv_have_kde="have_kde=no"
-else
-  ac_cv_have_kde="have_kde=yes \
-    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-fi
-
-else dnl test -z $1
-
-  ac_cv_have_kde="have_kde=no"
-
-fi
-])dnl
-
-eval "$ac_cv_have_kde"
-
-if test "$have_kde" != "yes"; then
- if test "${prefix}" = NONE; then
-  ac_kde_prefix="$ac_default_prefix"
- else
-  ac_kde_prefix="$prefix"
- fi
- if test "$exec_prefix" = NONE; then
-  ac_kde_exec_prefix="$ac_kde_prefix"
-  AC_MSG_RESULT([will be installed in $ac_kde_prefix])
- else
-  ac_kde_exec_prefix="$exec_prefix"
-  AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
- fi
-
- kde_libraries="${libdir}"
- kde_includes="${includedir}"
-
-else
-  ac_cv_have_kde="have_kde=yes \
-    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-  AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes])
-
-  kde_libraries="$ac_kde_libraries"
-  kde_includes="$ac_kde_includes"
-fi
-AC_SUBST(kde_libraries)
-AC_SUBST(kde_includes)
-
-if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes"  || test "$kde_includes" = "/usr/include"; then
- KDE_INCLUDES=""
-else
- KDE_INCLUDES="-I$kde_includes"
- all_includes="$KDE_INCLUDES $all_includes"
-fi
-
-KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
- 
-KDE_LDFLAGS="-L$kde_libraries"
-if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then 
- all_libraries="$all_libraries $KDE_LDFLAGS"
-fi
-
-AC_SUBST(KDE_LDFLAGS)
-AC_SUBST(KDE_INCLUDES)
-
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-all_libraries="$all_libraries $USER_LDFLAGS"
-all_includes="$all_includes $USER_INCLUDES"
-AC_SUBST(all_includes)
-AC_SUBST(all_libraries)
-
-if test -z "$1"; then
-KDE_CHECK_UIC_PLUGINS
-fi
-
-ac_kde_libraries="$kde_libdir"
-
-AC_SUBST(AUTODIRS)
-
-
-])
-
-AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
-[
-AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes,AC_HELP_STRING([--with-extra-includes=DIR],[adds non standard include paths]),
-  kde_use_extra_includes="$withval",
-  kde_use_extra_includes=NONE
-)
-kde_extra_includes=
-if test -n "$kde_use_extra_includes" && \
-   test "$kde_use_extra_includes" != "NONE"; then
-
-   ac_save_ifs=$IFS
-   IFS=':'
-   for dir in $kde_use_extra_includes; do
-     kde_extra_includes="$kde_extra_includes $dir"
-     USER_INCLUDES="$USER_INCLUDES -I$dir"
-   done
-   IFS=$ac_save_ifs
-   kde_use_extra_includes="added"
-else
-   kde_use_extra_includes="no"
-fi
-AC_SUBST(USER_INCLUDES)
-
-AC_MSG_RESULT($kde_use_extra_includes)
-
-kde_extra_libs=
-AC_MSG_CHECKING(for extra libs)
-AC_ARG_WITH(extra-libs,AC_HELP_STRING([--with-extra-libs=DIR],[adds non standard library paths]),
-  kde_use_extra_libs=$withval,
-  kde_use_extra_libs=NONE
-)
-if test -n "$kde_use_extra_libs" && \
-   test "$kde_use_extra_libs" != "NONE"; then
-
-   ac_save_ifs=$IFS
-   IFS=':'
-   for dir in $kde_use_extra_libs; do
-     kde_extra_libs="$kde_extra_libs $dir"
-     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
-     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
-   done
-   IFS=$ac_save_ifs
-   kde_use_extra_libs="added"
-else
-   kde_use_extra_libs="no"
-fi
-
-AC_SUBST(USER_LDFLAGS)
-
-AC_MSG_RESULT($kde_use_extra_libs)
-
-])
-
-AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
-[
-    AC_MSG_CHECKING([for KDE headers installed])
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include "confdefs.h"
-#include <kapp.h>
-
-int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-    printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-    printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-    printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-    printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-    printf("kde_styledir=\\"/tmp/dummy\\"\n");
-    printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-    printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-    printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-    printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-    printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-    return 0;
-    }
-EOF
-
- ac_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$all_includes $CPPFLAGS"
- if AC_TRY_EVAL(ac_compile); then
-   AC_MSG_RESULT(yes)
- else
-   AC_MSG_ERROR([your system is not able to compile a small KDE application!
-Check, if you installed the KDE header files correctly.
-For more details about this problem, look at the end of config.log.])
-  fi
-  CPPFLAGS=$ac_save_CPPFLAGS
-
-  AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_CHECK_KDEQTADDON],
-[
-AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
-[
- kde_ldflags_safe="$LDFLAGS"
- kde_libs_safe="$LIBS"
- kde_cxxflags_safe="$CXXFLAGS"
-
- LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
- LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
-
- AC_TRY_LINK([
-   #include <qdom.h>
- ],
- [
-   QDomDocument doc;
- ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
- )
-
- LDFLAGS=$kde_ldflags_safe
- LIBS=$kde_libs_safe
- CXXFLAGS=$kde_cxxflags_safe
-])
-
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
-
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
-  AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
-It is a separate package (and CVS module) named kde-qt-addon.])
-fi
-])
-
-AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
-[
-   AC_REQUIRE([KDE_MISC_TESTS])
-   AC_REQUIRE([KDE_CHECK_LIBDL])
-   AC_REQUIRE([K_PATH_X])
-
-if test $kde_qtver = 3; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
-# these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
-   AC_SUBST(LIB_KFILE, "-lkio")
-elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
-   AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
-   AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-else
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
-fi
-])
-
-AC_DEFUN([AC_PATH_KDE],
-[
-  AC_BASE_PATH_KDE
-  AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]),
-  [
-  if test "$enableval" = "no";
-    then ac_use_path_checking="default"
-    else ac_use_path_checking=""
-  fi
-  ],
-  [
-  if test "$kde_qtver" = 1;
-    then ac_use_path_checking=""
-    else ac_use_path_checking="default"
-  fi
-  ]
-  )
-
-  AC_CREATE_KFSSTND($ac_use_path_checking)
-
-  AC_SUBST_KFSSTND
-  KDE_CREATE_LIBS_ALIASES
-])
-
-dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found])
-AC_DEFUN([KDE_CHECK_FUNC_EXT],
-[
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(kde_cv_func_$1,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-kde_safe_LIBS="$LIBS"
-LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_COMPILE([
-$2
-],
-[
-$3
-],
-kde_cv_func_$1=yes,
-kde_cv_func_$1=no)
-CXXFLAGS="$save_CXXFLAGS"
-LIBS="$kde_safe_LIBS"
-AC_LANG_RESTORE
-])
-
-AC_MSG_RESULT($kde_cv_func_$1)
-
-AC_MSG_CHECKING([if $1 needs custom prototype])
-AC_CACHE_VAL(kde_cv_proto_$1,
-[
-if test "x$kde_cv_func_$1" = xyes; then
-  kde_cv_proto_$1=no
-else
-  case "$1" in
-	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_$1="yes - in libkdefakes"
-		;;
-	*)
-		kde_cv_proto_$1=unknown
-		;;
-  esac
-fi
-
-if test "x$kde_cv_proto_$1" = xunknown; then
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-  kde_safe_libs=$LIBS
-  LIBS="$LIBS $X_EXTRA_LIBS"
-  AC_TRY_LINK([
-$2
-
-extern "C" $4;
-],
-[
-$3
-],
-[ kde_cv_func_$1=yes
-  kde_cv_proto_$1=yes ],
-  [kde_cv_proto_$1="$1 unavailable"]
-)
-LIBS=$kde_safe_libs
-AC_LANG_RESTORE
-fi
-])
-AC_MSG_RESULT($kde_cv_proto_$1)
-
-if test "x$kde_cv_func_$1" = xyes; then
-  AC_DEFINE(HAVE_$5, 1, [Define if you have $1])
-  $6
-fi
-if test "x$kde_cv_proto_$1" = xno; then
-  AC_DEFINE(HAVE_$5_PROTO, 1,
-  [Define if you have the $1 prototype])
-fi
-
-AH_VERBATIM([_HAVE_$5_PROTO],
-[
-#if !defined(HAVE_$5_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-$4;
-#ifdef __cplusplus
-}
-#endif
-#endif
-])
-])
-
-AC_DEFUN([AC_CHECK_SETENV],
-[
-	KDE_CHECK_FUNC_EXT(setenv, [
-#include <stdlib.h>
-], 
-		[setenv("VAR", "VALUE", 1);],
-	        [int setenv (const char *, const char *, int)],
-		[SETENV])
-])
-
-AC_DEFUN([AC_CHECK_UNSETENV],
-[
-	KDE_CHECK_FUNC_EXT(unsetenv, [
-#include <stdlib.h>
-], 
-		[unsetenv("VAR");],
-	        [void unsetenv (const char *)],
-		[UNSETENV])
-])
-
-AC_DEFUN([AC_CHECK_GETDOMAINNAME],
-[
-	KDE_CHECK_FUNC_EXT(getdomainname, [
-#include <stdlib.h>
-#include <unistd.h>
-#include <netdb.h>
-], 
-		[
-char buffer[200];
-getdomainname(buffer, 200);
-], 	
-	        [#include <sys/types.h>
-		int getdomainname (char *, size_t)],
-		[GETDOMAINNAME])
-])
-
-AC_DEFUN([AC_CHECK_GETHOSTNAME],
-[
-	KDE_CHECK_FUNC_EXT(gethostname, [
-#include <stdlib.h>
-#include <unistd.h>
-], 
-		[
-char buffer[200];
-gethostname(buffer, 200);
-], 	
-	        [int gethostname (char *, unsigned int)],
-		[GETHOSTNAME])
-])
-
-AC_DEFUN([AC_CHECK_USLEEP],
-[
-	KDE_CHECK_FUNC_EXT(usleep, [
-#include <unistd.h>
-], 
-		[
-usleep(200);
-], 	
-	        [int usleep (unsigned int)],
-		[USLEEP])
-])
-
-
-AC_DEFUN([AC_CHECK_RANDOM],
-[
-	KDE_CHECK_FUNC_EXT(random, [
-#include <stdlib.h>
-], 
-		[
-random();
-], 	
-	        [long int random(void)],
-		[RANDOM])
-
-	KDE_CHECK_FUNC_EXT(srandom, [
-#include <stdlib.h>
-], 
-		[
-srandom(27);
-], 	
-	        [void srandom(unsigned int)],
-		[SRANDOM])
-
-])
-
-AC_DEFUN([AC_CHECK_INITGROUPS],
-[
-	KDE_CHECK_FUNC_EXT(initgroups, [
-#include <sys/types.h>
-#include <unistd.h>
-#include <grp.h>
-],
-	[
-char buffer[200];
-initgroups(buffer, 27);
-],
-	[int initgroups(const char *, gid_t)],
-	[INITGROUPS])
-])
-
-AC_DEFUN([AC_CHECK_MKSTEMPS],
-[
-	KDE_CHECK_FUNC_EXT(mkstemps, [
-#include <stdlib.h>
-#include <unistd.h>
-],
-	[
-mkstemps("/tmp/aaaXXXXXX", 6);
-],
-	[int mkstemps(char *, int)],
-	[MKSTEMPS])
-])
-
-AC_DEFUN([AC_CHECK_MKDTEMP],
-[
-	KDE_CHECK_FUNC_EXT(mkdtemp, [
-#include <stdlib.h>
-#include <unistd.h>
-],
-	[
-mkdtemp("/tmp/aaaXXXXXX");
-],
-	[char *mkdtemp(char *)],
-	[MKDTEMP])
-])
-
-
-AC_DEFUN([AC_CHECK_RES_INIT],
-[
-  AC_MSG_CHECKING([if res_init needs -lresolv])
-  kde_libs_safe="$LIBS"
-  LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-  AC_TRY_LINK(
-    [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-    ],
-    [
-      res_init(); 
-    ],
-    [
-      LIBRESOLV="-lresolv"
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-    ],
-    [ AC_MSG_RESULT(no) ]
-  )
-  LIBS=$kde_libs_safe
-  AC_SUBST(LIBRESOLV)
-
-  AC_MSG_CHECKING([if res_init is available])
-  AC_TRY_COMPILE(
-    [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-    ],
-    [
-      res_init();
-    ],
-    [
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-    ],
-    [ AC_MSG_RESULT(no) ]
-  )
-])
-
-AC_DEFUN([AC_CHECK_STRLCPY],
-[
-	KDE_CHECK_FUNC_EXT(strlcpy, [
-#include <string.h>
-],
-[ char buf[20];
-  strlcpy(buf, "KDE function test", sizeof(buf));
-],
- 	[unsigned long strlcpy(char*, const char*, unsigned long)],
-	[STRLCPY])
-])
-
-AC_DEFUN([AC_CHECK_STRLCAT],
-[
-	KDE_CHECK_FUNC_EXT(strlcat, [
-#include <string.h>
-],
-[ char buf[20];
-  buf[0]='\0';
-  strlcat(buf, "KDE function test", sizeof(buf));
-],
- 	[unsigned long strlcat(char*, const char*, unsigned long)],
-	[STRLCAT])
-])
-
-AC_DEFUN([AC_FIND_GIF],
-   [AC_MSG_CHECKING([for giflib])
-AC_CACHE_VAL(ac_cv_lib_gif,
-[ac_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
-else
-LIBS="$all_libraries -lgif"
-fi
-AC_TRY_LINK(dnl
-[
-#ifdef __cplusplus
-extern "C" {
-#endif
-int GifLastError(void);
-#ifdef __cplusplus
-}
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-],
-            [return GifLastError();],
-            eval "ac_cv_lib_gif=yes",
-            eval "ac_cv_lib_gif=no")
-LIBS="$ac_save_LIBS"
-])dnl
-if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
-else
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
-fi
-])
-
-AC_DEFUN([KDE_FIND_JPEG_HELPER],
-[
-AC_MSG_CHECKING([for libjpeg$2])
-AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
-[
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(
-[/* Override any gcc2 internal prototype to avoid an error.  */
-struct jpeg_decompress_struct;
-typedef struct jpeg_decompress_struct * j_decompress_ptr;
-typedef int size_t;
-#ifdef __cplusplus
-extern "C" {
-#endif
-    void jpeg_CreateDecompress(j_decompress_ptr cinfo,
-                                    int version, size_t structsize);
-#ifdef __cplusplus
-}
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-],
-            [jpeg_CreateDecompress(0L, 0, 0);],
-            eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
-            eval "ac_cv_lib_jpeg_$1=no")
-LIBS="$ac_save_LIBS"
-CFLAGS="$ac_save_CFLAGS"
-])
-
-if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then
-  LIBJPEG="$ac_cv_lib_jpeg_$1"
-  AC_MSG_RESULT($ac_cv_lib_jpeg_$1)
-else
-  AC_MSG_RESULT(no)
-  $3
-fi
-
-])
-
-AC_DEFUN([AC_FIND_JPEG],
-[
-dnl first look for libraries
-KDE_FIND_JPEG_HELPER(6b, 6b,
-   KDE_FIND_JPEG_HELPER(normal, [],
-    [
-       LIBJPEG=
-    ]
-   )
-)
-
-dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
-dnl requires system dependent includes loaded before it)
-jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
-test "x$jpeg_incdir" = xNO && jpeg_incdir=
-
-dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
-dnl if only one is missing, it means a configuration error, but we still
-dnl only warn
-if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-  AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
-else
-  if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-    AC_MSG_WARN([
-There is an installation error in jpeg support. You seem to have only one
-of either the headers _or_ the libraries installed. You may need to either
-provide correct --with-extra-... options, or the development package of
-libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-Disabling JPEG support.
-])
-  else
-    AC_MSG_WARN([libjpeg not found. disable JPEG support.])
-  fi
-  jpeg_incdir=
-  LIBJPEG=
-fi
-
-AC_SUBST(LIBJPEG)
-AH_VERBATIM(_AC_CHECK_JPEG,
-[/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-])
-])
-
-AC_DEFUN([KDE_CHECK_QT_JPEG],
-[
-if test -n "$LIBJPEG"; then
-AC_MSG_CHECKING([if Qt needs $LIBJPEG])
-AC_CACHE_VAL(kde_cv_qt_jpeg,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
-LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(
-[#include <qapplication.h>],
-            [
-            int argc;
-            char** argv;
-            QApplication app(argc, argv);],
-            eval "kde_cv_qt_jpeg=no",
-            eval "kde_cv_qt_jpeg=yes")
-LIBS="$ac_save_LIBS"
-CXXFLAGS="$ac_save_CXXFLAGS"
-AC_LANG_RESTORE
-fi
-])
-
-if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
-  AC_MSG_RESULT(yes)
-  LIBJPEG_QT='$(LIBJPEG)'
-else
-  AC_MSG_RESULT(no)
-  LIBJPEG_QT=
-fi
-
-])
-
-AC_DEFUN([AC_FIND_ZLIB],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for libz])
-AC_CACHE_VAL(ac_cv_lib_z,
-[
-kde_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(dnl
-[
-#include<zlib.h>
-],
-[
-  char buf[42];
-  gzFile f = (gzFile) 0;
-  /* this would segfault.. but we only link, don't run */
-  (void) gzgets(f, buf, sizeof(buf));
-
-  return (zlibVersion() == ZLIB_VERSION); 
-],
-            eval "ac_cv_lib_z='-lz'",
-            eval "ac_cv_lib_z=no")
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if test ! "$ac_cv_lib_z" = no; then
-  AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
-  LIBZ="$ac_cv_lib_z"
-  AC_MSG_RESULT($ac_cv_lib_z)
-else
-  AC_MSG_ERROR(not found. 
-          Possibly configure picks up an outdated version
-          installed by XFree86. Remove it from your system.
-
-          Check your installation and look into config.log)
-  LIBZ=""
-fi
-AC_SUBST(LIBZ)
-])
-
-AC_DEFUN([KDE_TRY_TIFFLIB],
-[
-AC_MSG_CHECKING([for libtiff $1])
-
-AC_CACHE_VAL(kde_cv_libtiff_$1,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-else
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm"
-fi
-kde_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
-[
-#include<tiffio.h>
-],
-    [return (TIFFOpen( "", "r") == 0); ],
-[
-    kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
-], [
-    kde_cv_libtiff_$1=no
-])
-
-LIBS="$kde_save_LIBS"
-CXXFLAGS="$kde_save_CXXFLAGS"
-AC_LANG_RESTORE
-])
-
-if test "$kde_cv_libtiff_$1" = "no"; then
-    AC_MSG_RESULT(no)
-    LIBTIFF=""
-    $3
-else
-    LIBTIFF="$kde_cv_libtiff_$1"
-    AC_MSG_RESULT(yes)
-    AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff])
-    $2
-fi
-
-])
-
-AC_DEFUN([AC_FIND_TIFF],
-[
-AC_REQUIRE([K_PATH_X])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_REQUIRE([AC_FIND_JPEG])
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-KDE_TRY_TIFFLIB(tiff, [],
-   KDE_TRY_TIFFLIB(tiff34))
-
-AC_SUBST(LIBTIFF)
-])
-
-
-AC_DEFUN([AC_FIND_PNG],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_MSG_CHECKING([for libpng])
-AC_CACHE_VAL(ac_cv_lib_png,
-[
-kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-else
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-fi
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
-    [
-    #include<png.h>
-    ],
-    [
-    png_structp png_ptr = png_create_read_struct(  /* image ptr */
-		PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-    return( png_ptr != 0 );
-    ],
-    eval "ac_cv_lib_png='-lpng $LIBZ -lm'",
-    eval "ac_cv_lib_png=no"
-)
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-  AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
-  LIBPNG="$ac_cv_lib_png"
-  AC_SUBST(LIBPNG)
-  AC_MSG_RESULT($ac_cv_lib_png)
-else
-  AC_MSG_RESULT(no)
-  LIBPNG=""
-  AC_SUBST(LIBPNG)
-fi
-])
-
-
-AC_DEFUN([AC_FIND_JASPER],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_JPEG])
-AC_MSG_CHECKING([for jasper])
-AC_CACHE_VAL(ac_cv_jasper,
-[
-kde_save_LIBS="$LIBS"
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
-    [
-    #include<jasper/jasper.h>
-    ],
-    [
-    return( jas_init() );
-    ],
-    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
-    eval "ac_cv_jasper=no"
-)
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then
-  AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper])
-  LIB_JASPER="$ac_cv_jasper"
-  AC_MSG_RESULT($ac_cv_jasper)
-else
-  AC_MSG_RESULT(no)
-  LIB_JASPER=""
-fi
-AC_SUBST(LIB_JASPER)
-])
-
-AC_DEFUN([AC_CHECK_BOOL],
-[
-  AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
-])
-
-AC_DEFUN([AC_CHECK_GNU_EXTENSIONS],
-[
-AC_MSG_CHECKING(if you need GNU extensions)
-AC_CACHE_VAL(ac_cv_gnu_extensions,
-[
-cat > conftest.c << EOF
-#include <features.h>
-
-#ifdef __GNU_LIBRARY__
-yes
-#endif
-EOF
-
-if (eval "$ac_cpp conftest.c") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_gnu_extensions=yes
-else
-  ac_cv_gnu_extensions=no
-fi
-])
-
-AC_MSG_RESULT($ac_cv_gnu_extensions)
-if test "$ac_cv_gnu_extensions" = "yes"; then
-  AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions])
-fi
-])
-
-AC_DEFUN([KDE_CHECK_COMPILER_FLAG],
-[
-AC_MSG_CHECKING([whether $CXX supports -$1])
-kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
-AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
-[
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -$1"
-  AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], [])
-  CXXFLAGS="$save_CXXFLAGS"
-  AC_LANG_RESTORE
-])
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- AC_MSG_RESULT(yes)
- :
- $2
-else
- AC_MSG_RESULT(no)
- :
- $3
-fi
-])
-
-dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables
-dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever])
-dnl it's all white-space separated
-AC_DEFUN([AC_REMOVE_FORBIDDEN],
-[ __val=$$1
-  __forbid=" $2 "
-  if test -n "$__val"; then
-    __new=""
-    ac_save_IFS=$IFS
-    IFS=" 	"
-    for i in $__val; do
-      case "$__forbid" in
-        *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;;
-	*) # Careful to not add spaces, where there were none, because otherwise
-	   # libtool gets confused, if we change e.g. CXX
-	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-      esac
-    done
-    IFS=$ac_save_IFS
-    $1=$__new
-  fi
-])
-
-dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
-AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
-[dnl
-if test "x$kde_use_qt_emb" != "xyes"; then
- AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
-else
- AC_REMOVE_FORBIDDEN(CXX, [-rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath])
-fi
-])
-
-AC_DEFUN([AC_CHECK_COMPILERS],
-[
-  AC_ARG_ENABLE(debug,
-	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
-  [
-    case $enableval in
-      yes)
-        kde_use_debug_code="yes"
-        kde_use_debug_define=no
-        ;;
-      full)
-        kde_use_debug_code="full"
-        kde_use_debug_define=no
-        ;;
-      *)
-        kde_use_debug_code="no"
-        kde_use_debug_define=yes
-        ;;
-    esac
-  ], 
-    [kde_use_debug_code="no"
-      kde_use_debug_define=no
-  ])
-
-  dnl Just for configure --help
-  AC_ARG_ENABLE(dummyoption,
-	        AC_HELP_STRING([--disable-debug],
-	  		       [disables debug output and debug symbols [default=no]]),
-		[],[])
-
-  AC_ARG_ENABLE(strict,
-		AC_HELP_STRING([--enable-strict],
-			      [compiles with strict compiler options (may not work!)]),
-   [
-    if test $enableval = "no"; then
-         kde_use_strict_options="no"
-       else
-         kde_use_strict_options="yes"
-    fi
-   ], [kde_use_strict_options="no"])
-
-  AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similiar]),
-   [
-    if test $enableval = "no"; then
-         kde_use_warnings="no"
-       else
-         kde_use_warnings="yes"
-    fi
-   ], [kde_use_warnings="yes"])
-
-  dnl enable warnings for debug build
-  if test "$kde_use_debug_code" != "no"; then
-    kde_use_warnings=yes
-  fi
-
-  AC_ARG_ENABLE(profile,AC_HELP_STRING([--enable-profile],[creates profiling infos [default=no]]),
-    [kde_use_profiling=$enableval],
-    [kde_use_profiling="no"]
-  )
-
-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-  CFLAGS=" $CFLAGS"
-
-  AC_PROG_CC 
-
-  AC_PROG_CPP
-
-  if test "$GCC" = "yes"; then
-    if test "$kde_use_debug_code" != "no"; then
-      if test $kde_use_debug_code = "full"; then
-        CFLAGS="-g3 -fno-inline $CFLAGS"
-      else
-        CFLAGS="-g -O2 $CFLAGS"
-      fi
-    else
-      CFLAGS="-O2 $CFLAGS"
-    fi
-  fi
-
-  if test "$kde_use_debug_define" = "yes"; then
-    CFLAGS="-DNDEBUG $CFLAGS"
-  fi
-
-
-  case "$host" in
-  *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
-  *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
-  esac
-
-  if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then
-     LDFLAGS=""
-  fi
-
-  CXXFLAGS=" $CXXFLAGS"
-
-  AC_PROG_CXX
-
-  if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-    if test "$kde_use_debug_code" != "no"; then
-      if test "$CXX" = "KCC"; then
-        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-      else
-        if test "$kde_use_debug_code" = "full"; then
-          CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
-        else
-          CXXFLAGS="-g -O2 $CXXFLAGS"
-        fi
-      fi
-      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-
-      dnl convenience compiler flags
-      KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""])
-      AC_SUBST(WOVERLOADED_VIRTUAL)
-    else
-      if test "$CXX" = "KCC"; then
-        CXXFLAGS="+K3 $CXXFLAGS"
-      else
-        CXXFLAGS="-O2 $CXXFLAGS"
-      fi  
-    fi
-  fi
-
-  if test "$kde_use_debug_define" = "yes"; then
-    CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
-  fi  
-
-  if test "$kde_use_profiling" = "yes"; then
-    KDE_CHECK_COMPILER_FLAG(pg,
-    [
-      CFLAGS="-pg $CFLAGS"
-      CXXFLAGS="-pg $CXXFLAGS"
-    ])
-  fi
-
-  if test "$kde_use_warnings" = "yes"; then
-      if test "$GCC" = "yes"; then
-        case $host in
-          *-*-linux-gnu)	
-            CFLAGS="-ansi -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
-            KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"; CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
-          ;;
-        esac
-        CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-        KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
-        KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
-        KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"])
-     fi
-  fi
-
-  if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then
-    CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
-  fi
-    
-  if test "$GXX" = "yes"; then
-    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
-    KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
-    KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
-    KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
-  fi
-  if test "$CXX" = "KCC"; then
-    dnl unfortunately we currently cannot disable exception support in KCC
-    dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
-    dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"])
-    dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS=	)
-
-    AC_ARG_ENABLE(pch,
-	AC_HELP_STRING([--enable-pch],
-		       [enables precompiled header support (currently only KCC) [default=no]]),
-    [
-      kde_use_pch=$enableval
-    ],[kde_use_pch=no])
- 
-    if test "$kde_use_pch" = "yes"; then
-      dnl TODO: support --pch-dir!
-      KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"])
-      dnl the below works (but the dir must exist), but it's
-      dnl useless for a whole package.
-      dnl The are precompiled headers for each source file, so when compiling
-      dnl from scratch, it doesn't make a difference, and they take up
-      dnl around ~5Mb _per_ sourcefile.
-      dnl KDE_CHECK_COMPILER_FLAG(-pch_dir /tmp,
-      dnl   [CXXFLAGS="$CXXFLAGS --pch_dir `pwd`/pcheaders"])
-    fi
-    dnl this flag controls inlining. by default KCC inlines in optimisation mode
-    dnl all implementations that are defined inside the class {} declaration. 
-    dnl because of templates-compatibility with broken gcc compilers, this
-    dnl can cause excessive inlining. This flag limits it to a sane level
-    KDE_CHECK_COMPILER_FLAG(-inline_keyword_space_time=6,[CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"])
-    KDE_CHECK_COMPILER_FLAG(-inline_auto_space_time=2,[CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"])
-    KDE_CHECK_COMPILER_FLAG(-inline_implicit_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"])
-    KDE_CHECK_COMPILER_FLAG(-inline_generated_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"])
-    dnl Some source files are shared between multiple executables
-    dnl (or libraries) and some of those need template instantiations.
-    dnl In that case KCC needs to compile those sources with
-    dnl --one_instantiation_per_object.  To make it easy for us we compile
-    dnl _all_ objects with that flag (--one_per is a shorthand).
-    KDE_CHECK_COMPILER_FLAG(-one_per, [CXXFLAGS="$CXXFLAGS --one_per"])
-  fi
-  AC_SUBST(USE_EXCEPTIONS)
-  dnl obsolete macro - provided to keep things going
-  USE_RTTI=
-  AC_SUBST(USE_RTTI)
-
-  case "$host" in
-      *-*-irix*)  test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;;
-      *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";;
-      *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";;
-      *-*-solaris*) 
-        if test "$GXX" = yes; then
-          libstdcpp=`$CXX -print-file-name=libstdc++.so`
-          if test ! -f $libstdcpp; then
-             AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so])
-          fi
-        fi
-        ;;
-  esac
-
-  AC_VALIDIFY_CXXFLAGS
-
-  AC_PROG_CXXCPP
-
-  if test "$GCC" = yes; then
-     NOOPT_CFLAGS=-O0
-  fi
-  KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0])
-
-  AC_SUBST(NOOPT_CXXFLAGS)
-  AC_SUBST(NOOPT_CFLAGS)
-
-  KDE_CHECK_FINAL
-  KDE_CHECK_CLOSURE
-  KDE_CHECK_NMCHECK
-
-  ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
-])
-
-AC_DEFUN([KDE_ADD_DEPENDENCIES],
-[
-   [A]M_DEPENDENCIES(CC)
-   [A]M_DEPENDENCIES(CXX)
-])
-
-dnl just a wrapper to clean up configure.in
-AC_DEFUN([KDE_PROG_LIBTOOL],
-[
-AC_REQUIRE([AC_CHECK_COMPILERS])
-AC_REQUIRE([AC_ENABLE_SHARED])
-AC_REQUIRE([AC_ENABLE_STATIC])
-
-AC_REQUIRE([AC_LIBTOOL_DLOPEN])
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_OBJEXT
-AC_EXEEXT
-
-AM_PROG_LIBTOOL
-AC_LIBTOOL_CXX
-
-LIBTOOL_SHELL="/bin/sh ./libtool"
-#  LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
-AC_SUBST(KDE_PLUGIN)
-
-# we patch configure quite some so we better keep that consistent for incremental runs 
-AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
-])
-
-AC_DEFUN([KDE_CHECK_LIB64],
-[
-    kdelibsuff=no
-    AC_ARG_ENABLE(libsuffix,
-        AC_HELP_STRING([--enable-libsuffix],
-            [/lib directory suffix (64,32,none[=default])]),
-            kdelibsuff=$enableval)
-    # TODO: add an auto case that compiles a little C app to check
-    # where the glibc is
-    if test "$kdelibsuff" = "no"; then
-       kdelibsuff=
-    fi
-    if test -z "$kdelibsuff"; then
-        AC_MSG_RESULT([not using lib directory suffix])
-        AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
-    else
-        if test "$libdir" = '${exec_prefix}/lib'; then
-            libdir="$libdir${kdelibsuff}"
-            AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
-        fi
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
-    fi
-])
-
-AC_DEFUN([KDE_CHECK_TYPES],
-[  AC_CHECK_SIZEOF(int, 4)dnl
-   AC_CHECK_SIZEOF(short)dnl
-  AC_CHECK_SIZEOF(long, 4)dnl
-  AC_CHECK_SIZEOF(char *, 4)dnl
-])dnl
-
-AC_DEFUN([KDE_DO_IT_ALL],
-[
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE($1, $2)
-AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
-AC_CHECK_COMPILERS
-KDE_PROG_LIBTOOL
-AM_KDE_WITH_NLS
-AC_PATH_KDE
-])
-
-AC_DEFUN([AC_CHECK_RPATH],
-[
-AC_MSG_CHECKING(for rpath)
-AC_ARG_ENABLE(rpath,
-      AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]),
-      USE_RPATH=$enableval, USE_RPATH=yes)
-
-if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-
-  KDE_RPATH="-R \$(kde_libraries)"
-
-  if test -n "$qt_libraries"; then
-    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-  fi
-  dnl $x_libraries is set to /usr/lib in case
-  if test -n "$X_LDFLAGS"; then
-    X_RPATH="-R \$(x_libraries)"
-    KDE_RPATH="$KDE_RPATH $X_RPATH"
-  fi
-  if test -n "$KDE_EXTRA_RPATH"; then
-    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
-  fi
-fi
-AC_SUBST(KDE_EXTRA_RPATH)
-AC_SUBST(KDE_RPATH)
-AC_SUBST(X_RPATH)
-AC_MSG_RESULT($USE_RPATH)
-])
-
-dnl Check for the type of the third argument of getsockname
-AC_DEFUN([AC_CHECK_SOCKLEN_T], [
-  AC_MSG_CHECKING(for socklen_t)
-  AC_CACHE_VAL(ac_cv_socklen_t, [
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-      ],[
-socklen_t a=0;
-getsockname(0,(struct sockaddr*)0, &a);
-      ],
-      ac_cv_socklen_t=socklen_t,
-      AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-        ],[
-int a=0;
-getsockname(0,(struct sockaddr*)0, &a);
-        ],
-        ac_cv_socklen_t=int,
-        ac_cv_socklen_t=size_t
-      )
-    )
-    AC_LANG_RESTORE
-  ])
-
-  AC_MSG_RESULT($ac_cv_socklen_t)
-  if test "$ac_cv_socklen_t" != "socklen_t"; then
-    AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t,
-        [Define the real type of socklen_t])
-  fi
-  AC_DEFINE_UNQUOTED(ksize_t, socklen_t, [Compatibility define])
-
-])
-
-dnl This is a merge of some macros out of the gettext aclocal.m4
-dnl since we don't need anything, I took the things we need
-dnl the copyright for them is:
-dnl >
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in 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 >
-dnl for this file it is relicensed under LGPL
-
-AC_DEFUN([AM_KDE_WITH_NLS],
-  [
-    dnl If we use NLS figure out what method
-
-    AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt,
-        [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt)
-    AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-     if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
-        AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it])
-        GMSGFMT=":"
-      fi
-      MSGFMT=$GMSGFMT
-      AC_SUBST(GMSGFMT)
-      AC_SUBST(MSGFMT)
-
-      AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext,
-	[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-
-      dnl Test whether we really found GNU xgettext.
-      if test "$XGETTEXT" != ":"; then
-	dnl If it is no GNU xgettext we define it as : so that the
-	dnl Makefiles still can work.
-	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  AC_MSG_RESULT(
-	    [found xgettext programs is not GNU xgettext; ignore it])
-	  XGETTEXT=":"
-	fi
-      fi
-     AC_SUBST(XGETTEXT)
-
-  ])
-
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# serial 1
-# Stephan Kulow: I appended a _KDE against name conflicts
-
-dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# serial 1
-
-AC_DEFUN([AM_LC_MESSAGES],
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your locale.h file contains LC_MESSAGES])
-    fi
-  fi])
-
-dnl From Jim Meyering.
-dnl FIXME: migrate into libit.
-
-AC_DEFUN([AM_FUNC_OBSTACK],
-[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
- [AC_TRY_LINK([#include "obstack.h"],
-	      [struct obstack *mem;obstack_free(mem,(char *) 0)],
-	      am_cv_func_obstack=yes,
-	      am_cv_func_obstack=no)])
- if test $am_cv_func_obstack = yes; then
-   AC_DEFINE(HAVE_OBSTACK)
- else
-   LIBOBJS="$LIBOBJS obstack.o"
- fi
-])
-
-dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
-dnl FIXME: Migrate into libit
-
-AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
-              am_cv_lib_error_at_line=yes,
-	      am_cv_lib_error_at_line=no)])
- if test $am_cv_lib_error_at_line = no; then
-   LIBOBJS="$LIBOBJS error.o"
- fi
- AC_SUBST(LIBOBJS)dnl
-])
-
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# serial 1
-# Stephan Kulow: I put a KDE in it to avoid name conflicts
-
-AC_DEFUN([AM_KDE_GNU_GETTEXT],
-  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-   AC_REQUIRE([AC_FUNC_MMAP])dnl
-   AC_REQUIRE([AM_KDE_WITH_NLS])dnl
-   AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
-
-   AC_MSG_CHECKING(for stpcpy)
-   AC_CACHE_VAL(kde_cv_func_stpcpy,
-   [
-   kde_safe_cxxflags=$CXXFLAGS
-   CXXFLAGS="-Werror"
-   AC_LANG_SAVE
-   AC_LANG_CPLUSPLUS
-   AC_TRY_COMPILE([
-   #include <string.h>
-   ],
-   [
-   char buffer[200];
-   stpcpy(buffer, buffer);
-   ],
-   kde_cv_func_stpcpy=yes,
-   kde_cv_func_stpcpy=no)
-   AC_LANG_RESTORE
-   CXXFLAGS=$kde_safe_cxxflags
-   ])
-   AC_MSG_RESULT($kde_cv_func_stpcpy)
-   if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then
-     AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy])
-   fi
-
-   AM_LC_MESSAGES
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-  ])
-
-AC_DEFUN([AC_HAVE_XPM],
- [AC_REQUIRE_CPP()dnl
-  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$XPM_LDFLAGS" && XPM_LDFLAGS=
- test -z "$XPM_INCLUDE" && XPM_INCLUDE=
-
- AC_ARG_WITH(xpm,AC_HELP_STRING([--without-xpm],[disable color pixmap XPM tests]),
-	xpm_test=$withval, xpm_test="yes")
- if test "x$xpm_test" = xno; then
-   ac_cv_have_xpm=no
- else
-   AC_MSG_CHECKING(for XPM)
-   AC_CACHE_VAL(ac_cv_have_xpm,
-   [
-    ac_save_ldflags="$LDFLAGS"
-    ac_save_cflags="$CFLAGS"
-    if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
-    else
-      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET"
-    fi
-    CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES"
-    test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
-    AC_TRY_LINK([#include <X11/xpm.h>],[],
-	ac_cv_have_xpm="yes",ac_cv_have_xpm="no")
-    LDFLAGS="$ac_save_ldflags"
-    CFLAGS="$ac_save_cflags"
-   ])dnl
-
-  if test "$ac_cv_have_xpm" = no; then
-    AC_MSG_RESULT(no)
-    XPM_LDFLAGS=""
-    XPMINC=""
-    $2
-  else
-    AC_DEFINE(HAVE_XPM, 1, [Define if you have XPM support])
-    if test "$XPM_LDFLAGS" = ""; then
-       XPMLIB='-lXpm $(LIB_X11)'
-    else
-       XPMLIB="-L$XPM_LDFLAGS -lXpm "'$(LIB_X11)'
-    fi
-    if test "$XPM_INCLUDE" = ""; then
-       XPMINC=""
-    else
-       XPMINC="-I$XPM_INCLUDE"
-    fi
-    AC_MSG_RESULT(yes)
-    $1
-  fi
- fi
- AC_SUBST(XPMINC)
- AC_SUBST(XPMLIB)
-])
-
-AC_DEFUN([AC_HAVE_DPMS],
- [AC_REQUIRE_CPP()dnl
-  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS=
- test -z "$DPMS_INCLUDE" && DPMS_INCLUDE=
- DPMS_LIB=
-
- AC_ARG_WITH(dpms,AC_HELP_STRING([--without-dpms],[disable DPMS power saving]),
-	dpms_test=$withval, dpms_test="yes")
- if test "x$dpms_test" = xno; then
-   ac_cv_have_dpms=no
- else
-   AC_MSG_CHECKING(for DPMS)
-   dnl Note: ac_cv_have_dpms can be no, yes, or -lXdpms.
-   dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms".
-   AC_CACHE_VAL(ac_cv_have_dpms,
-   [
-    if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then
-      AC_MSG_RESULT(no)
-      ac_cv_have_dpms="no"
-    else
-      ac_save_ldflags="$LDFLAGS"
-      ac_save_cflags="$CFLAGS"
-      ac_save_libs="$LIBS"
-      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
-      CFLAGS="$CFLAGS $X_INCLUDES"
-      test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-      AC_TRY_LINK([
-	  #include <X11/Xproto.h>
-	  #include <X11/X.h>
-	  #include <X11/Xlib.h>
-	  #include <X11/extensions/dpms.h>
-	  int foo_test_dpms()
-	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
-	  ac_cv_have_dpms="yes", [
-              LDFLAGS="$ac_save_ldflags"
-              CFLAGS="$ac_save_cflags"
-              LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
-              LIBS="$LIBS -lXdpms"
-              CFLAGS="$CFLAGS $X_INCLUDES"
-              test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-              AC_TRY_LINK([
-	          #include <X11/Xproto.h>
-        	  #include <X11/X.h>
-        	  #include <X11/Xlib.h>
-        	  #include <X11/extensions/dpms.h>
-        	  int foo_test_dpms()
-        	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
-        	  [
-                  ac_cv_have_dpms="-lXdpms"
-                  ],ac_cv_have_dpms="no")
-              ])
-      LDFLAGS="$ac_save_ldflags"
-      CFLAGS="$ac_save_cflags"
-      LIBS="$ac_save_libs"
-    fi
-   ])dnl
-
-  if test "$ac_cv_have_dpms" = no; then
-    AC_MSG_RESULT(no)
-    DPMS_LDFLAGS=""
-    DPMSINC=""
-    $2
-  else
-    AC_DEFINE(HAVE_DPMS, 1, [Define if you have DPMS support])
-    if test "$ac_cv_have_dpms" = "-lXdpms"; then
-       DPMS_LIB="-lXdpms"
-    fi
-    if test "$DPMS_LDFLAGS" = ""; then
-       DPMSLIB="$DPMS_LIB "'$(LIB_X11)'
-    else
-       DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)'
-    fi
-    if test "$DPMS_INCLUDE" = ""; then
-       DPMSINC=""
-    else
-       DPMSINC="-I$DPMS_INCLUDE"
-    fi
-    AC_MSG_RESULT(yes)
-    $1
-  fi
- fi
- ac_save_cflags="$CFLAGS"
- CFLAGS="$CFLAGS $X_INCLUDES"
- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
- AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO,
-   [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
- AC_CHECK_DECL(DPMSCapable,
-   AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
-   [#include <X11/extensions/dpms.h>])
- AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
-   [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
- AC_CHECK_DECL(DPMSInfo,
-   AC_DEFINE(HAVE_DPMSINFO_PROTO),,
-   [#include <X11/extensions/dpms.h>])
- CFLAGS="$ac_save_cflags"
- AC_SUBST(DPMSINC)
- AC_SUBST(DPMSLIB)
-])
-
-AC_DEFUN([AC_HAVE_GL],
- [AC_REQUIRE_CPP()dnl
-  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$GL_LDFLAGS" && GL_LDFLAGS=
- test -z "$GL_INCLUDE" && GL_INCLUDE=
-
- AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
-	gl_test=$withval, gl_test="yes")
- if test "x$kde_use_qt_emb" = "xyes"; then
-   # GL and Qt Embedded is a no-go for now.
-   ac_cv_have_gl=no
- elif test "x$gl_test" = xno; then
-   ac_cv_have_gl=no
- else
-   AC_MSG_CHECKING(for GL)
-   AC_CACHE_VAL(ac_cv_have_gl,
-   [
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_save_ldflags="$LDFLAGS"
-    ac_save_cxxflags="$CXXFLAGS"
-    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU"
-    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11"
-    LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET"
-    CXXFLAGS="$CFLAGS $X_INCLUDES"
-    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-    AC_TRY_LINK([#include <GL/gl.h>
-#include <GL/glu.h>
-], [],
-	ac_cv_have_gl="mesa", ac_cv_have_gl="no")
-    if test "x$ac_cv_have_gl" = "xno"; then
-      LDFLAGS="$ac_save_ldflags $X_LDFLAGS $GL_LDFLAGS $all_libraries -lGLU -lGL"
-      test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11"
-      LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET"
-      CXXFLAGS="$ac_save_cflags $X_INCLUDES"
-      test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-      AC_TRY_LINK([#include <GL/gl.h>
-#include <GL/glu.h>
-], [],
-	  ac_cv_have_gl="yes", ac_cv_have_gl="no")
-    fi
-    AC_LANG_RESTORE
-    LDFLAGS="$ac_save_ldflags"
-    CXXFLAGS="$ac_save_cxxflags"
-   ])dnl
-
-  if test "$ac_cv_have_gl" = "no"; then
-    AC_MSG_RESULT(no)
-    GL_LDFLAGS=""
-    GLINC=""
-    $2
-  else
-    AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
-    if test "$GL_LDFLAGS" = ""; then
-       if test "$ac_cv_have_gl" = "mesa"; then
-          GLLIB='-lMesaGLU -lMesaGL $(LIB_X11)'
-       else
-          GLLIB='-lGLU -lGL $(LIB_X11)'
-       fi
-    else
-       if test "$ac_cv_have_gl" = "mesa"; then
-          GLLIB="$GL_LDFLAGS -lMesaGLU -lMesaGL "'$(LIB_X11)'
-       else
-          GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
-       fi
-    fi
-    if test "$GL_INCLUDE" = ""; then
-       GLINC=""
-    else
-       GLINC="-I$GL_INCLUDE"
-    fi
-    AC_MSG_RESULT($ac_cv_have_gl)
-    $1
-  fi
- fi
- AC_SUBST(GLINC)
- AC_SUBST(GLLIB)
-])
-
-
- dnl shadow password and PAM magic - maintained by ossi@kde.org
-
-AC_DEFUN([KDE_PAM], [
-  AC_REQUIRE([KDE_CHECK_LIBDL])
-
-  want_pam=
-  AC_ARG_WITH(pam,
-    AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
-    [ if test "x$withval" = "xyes"; then
-        want_pam=yes
-        pam_service=kde
-      elif test "x$withval" = "xno"; then
-        want_pam=no
-      else
-        want_pam=yes
-        pam_service=$withval
-      fi
-    ], [ pam_service=kde ])
-
-  use_pam=
-  PAMLIBS=
-  if test "x$want_pam" != xno; then
-    AC_CHECK_LIB(pam, pam_start, [
-      AC_CHECK_HEADER(security/pam_appl.h,
-        [ pam_header=security/pam_appl.h ],
-        [ AC_CHECK_HEADER(pam/pam_appl.h,
-            [ pam_header=pam/pam_appl.h ],
-            [
-    AC_MSG_WARN([PAM detected, but no headers found!
-Make sure you have the necessary development packages installed.])
-            ]
-          )
-        ]
-      )
-    ], , $LIBDL)
-    if test -z "$pam_header"; then
-      if test "x$want_pam" = xyes; then
-        AC_MSG_ERROR([--with-pam was specified, but cannot compile with PAM!])
-      fi
-    else
-      AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
-      PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
-      use_pam=yes
-
-      dnl darwin claims to be something special
-      if test "$pam_header" = "pam/pam_appl.h"; then
-        AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your PAM headers are in pam/ instead of security/])
-      fi
-
-      dnl test whether struct pam_message is const (Linux) or not (Sun)
-      AC_MSG_CHECKING(for const pam_message)
-      AC_EGREP_HEADER([struct pam_message], $pam_header,
-        [ AC_EGREP_HEADER([const struct pam_message], $pam_header,
-                          [AC_MSG_RESULT([const: Linux-type PAM])],
-                          [AC_MSG_RESULT([nonconst: Sun-type PAM])
-                          AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])]
-                          )],
-        [AC_MSG_RESULT([not found - assume const, Linux-type PAM])])
-    fi
-  fi
-
-  AC_SUBST(PAMLIBS)
-])
-
-dnl DEF_PAM_SERVICE(arg name, full name, define name)
-AC_DEFUN([DEF_PAM_SERVICE], [
-  AC_ARG_WITH($1-pam,
-    AC_HELP_STRING([--with-$1-pam=[val]],[override PAM service from --with-pam for $2]),
-    [ if test "x$use_pam" = xyes; then
-        $3_PAM_SERVICE=$withval
-      else
-        AC_MSG_ERROR([Cannot use use --with-$1-pam, as no PAM was detected.
-You may want to enforce it by using --with-pam.])
-      fi
-    ], 
-    [ if test "x$use_pam" = xyes; then
-        $3_PAM_SERVICE="$pam_service"
-      fi
-    ])
-    if test -n "$$3_PAM_SERVICE"; then
-      AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE])
-      AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2])
-    fi
-    AC_SUBST($3_PAM_SERVICE)
-])
-
-AC_DEFUN([KDE_SHADOWPASSWD], [
-  AC_REQUIRE([KDE_PAM])
-
-  AC_CHECK_LIB(shadow, getspent,
-    [ LIBSHADOW="-lshadow"
-      ac_use_shadow=yes
-    ],
-    [ dnl for UnixWare
-      AC_CHECK_LIB(gen, getspent, 
-        [ LIBGEN="-lgen"
-          ac_use_shadow=yes
-        ], 
-        [ AC_CHECK_FUNC(getspent, 
-            [ ac_use_shadow=yes ],
-            [ ac_use_shadow=no ])
-	])
-    ])
-  AC_SUBST(LIBSHADOW)
-  AC_SUBST(LIBGEN)
-  
-  AC_MSG_CHECKING([for shadow passwords])
-
-  AC_ARG_WITH(shadow,
-    AC_HELP_STRING([--with-shadow],[If you want shadow password support]),
-    [ if test "x$withval" != "xno"; then
-        use_shadow=yes
-      else
-        use_shadow=no
-      fi
-    ], [
-      use_shadow="$ac_use_shadow"
-    ])
-
-  if test "x$use_shadow" = xyes; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_SHADOW, 1, [Define if you use shadow passwords])
-  else
-    AC_MSG_RESULT(no)
-    LIBSHADOW=
-    LIBGEN=
-  fi
-
-  dnl finally make the relevant binaries setuid root, if we have shadow passwds.
-  dnl this still applies, if we could use it indirectly through pam.
-  if test "x$use_shadow" = xyes || 
-     ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then
-      case $host in
-      *-*-freebsd* | *-*-netbsd* | *-*-openbsd*)
-	SETUIDFLAGS="-m 4755 -o root";;
-      *)
-	SETUIDFLAGS="-m 4755";;
-      esac
-  fi
-  AC_SUBST(SETUIDFLAGS)
-
-])
-
-AC_DEFUN([KDE_PASSWDLIBS], [
-  AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
-  AC_REQUIRE([KDE_PAM])
-  AC_REQUIRE([KDE_SHADOWPASSWD])
-
-  if test "x$use_pam" = "xyes"; then 
-    PASSWDLIBS="$PAMLIBS"
-  else
-    PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN"
-  fi
-
-  dnl FreeBSD uses a shadow-like setup, where /etc/passwd holds the users, but
-  dnl /etc/master.passwd holds the actual passwords.  /etc/master.passwd requires
-  dnl root to read, so kcheckpass needs to be root (even when using pam, since pam
-  dnl may need to read /etc/master.passwd).
-  case $host in
-  *-*-freebsd*)
-    SETUIDFLAGS="-m 4755 -o root"
-    ;;
-  *)
-    ;;
-  esac
-
-  AC_SUBST(PASSWDLIBS)
-])
-
-AC_DEFUN([KDE_CHECK_LIBDL],
-[
-AC_CHECK_LIB(dl, dlopen, [
-LIBDL="-ldl"
-ac_cv_have_dlfcn=yes
-])
-
-AC_CHECK_LIB(dld, shl_unload, [
-LIBDL="-ldld"
-ac_cv_have_shload=yes
-])
-
-AC_SUBST(LIBDL)
-])
-
-AC_DEFUN([KDE_CHECK_DLOPEN],
-[
-KDE_CHECK_LIBDL
-AC_CHECK_HEADERS(dlfcn.h dl.h)
-if test "$ac_cv_header_dlfcn_h" = "no"; then
-  ac_cv_have_dlfcn=no
-fi
-
-if test "$ac_cv_header_dl_h" = "no"; then
-  ac_cv_have_shload=no
-fi
-
-dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE
-dnl (MM)
-AC_ARG_ENABLE(dlopen,
-AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]),
-enable_dlopen=$enableval,
-enable_dlopen=yes)
-
-# override the user's opinion, if we know it better ;)
-if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then
-  enable_dlopen=no
-fi
-
-if test "$ac_cv_have_dlfcn" = "yes"; then
-  AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn])
-fi
-
-if test "$ac_cv_have_shload" = "yes"; then
-  AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload])
-fi
-
-if test "$enable_dlopen" = no ; then
-  test -n "$1" && eval $1
-else
-  test -n "$2" && eval $2
-fi
-
-])
-
-AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
-[
-KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no)
-KDE_PROG_LIBTOOL
-AC_MSG_CHECKING([dynamic loading])
-eval "`egrep '^build_libtool_libs=' libtool`"
-if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then
-  dynamic_loading=yes
-  AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING)
-else
-  dynamic_loading=no
-fi
-AC_MSG_RESULT($dynamic_loading)
-if test "$dynamic_loading" = "yes"; then
-  $1
-else
-  $2
-fi
-])
-
-AC_DEFUN([KDE_ADD_INCLUDES],
-[
-if test -z "$1"; then
-  test_include="Pix.h"
-else
-  test_include="$1"
-fi
-
-AC_MSG_CHECKING([for libg++ ($test_include)])
-
-AC_CACHE_VAL(kde_cv_libgpp_includes,
-[
-kde_cv_libgpp_includes=no
-
-   for ac_dir in               \
-                               \
-     /usr/include/g++          \
-     /usr/include              \
-     /usr/unsupported/include  \
-     /opt/include              \
-     $extra_include            \
-     ; \
-   do
-     if test -r "$ac_dir/$test_include"; then
-       kde_cv_libgpp_includes=$ac_dir
-       break
-     fi
-   done
-])
-
-AC_MSG_RESULT($kde_cv_libgpp_includes)
-if test "$kde_cv_libgpp_includes" != "no"; then
-  all_includes="-I$kde_cv_libgpp_includes $all_includes $USER_INCLUDES"
-fi
-])
-])
-
-AC_DEFUN([KDE_CHECK_LIBPTHREAD],
-[
-  LIBPTHREAD=""
-
-  if test -n "$PTHREAD_LIBS"; then
-    PTHREAD_LIBS_save="$PTHREAD_LIBS"
-    PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
-    KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [LIBPTHREAD="$PTHREAD_LIBS_save"] )
-    PTHREAD_LIBS="$PTHREAD_LIBS_save"
-  fi
-
-  if test -z "$LIBPTHREAD"; then
-    AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
-  fi
-
-  AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN([KDE_CHECK_PTHREAD_OPTION],
-[
-      USE_THREADS=""
-      if test -z "$LIBPTHREAD"; then
-        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"])
-      fi
-
-    AH_VERBATIM(__svr_define, [
-#if defined(__SVR4) && !defined(__svr4__)
-#define __svr4__ 1
-#endif
-])
-    case $host_os in
- 	solaris*)
-		KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"])
-                CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
-    		;;
-        freebsd*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
-                ;;
-        aix*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                LIBPTHREAD="$LIBPTHREAD -lc_r"
-                ;;
-        linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-                if test "$CXX" = "KCC"; then
-                  CXXFLAGS="$CXXFLAGS --thread_safe"
-		  NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
-                fi
-                ;;
-	*)
-		;;
-    esac
-    AC_SUBST(USE_THREADS)
-    AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN([KDE_CHECK_THREADING],
-[
-  AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-  AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION])
-  dnl default is yes if libpthread is found and no if no libpthread is available
-  if test -z "$LIBPTHREAD"; then
-    if test -z "$USE_THREADS"; then
-      kde_check_threading_default=no
-    else
-      kde_check_threading_default=yes
-    fi
-  else
-    kde_check_threading_default=yes
-  fi
-  AC_ARG_ENABLE(threading,AC_HELP_STRING([--disable-threading],[disables threading even if libpthread found]),
-   kde_use_threading=$enableval, kde_use_threading=$kde_check_threading_default)
-  if test "x$kde_use_threading" = "xyes"; then
-    AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)])
-  fi
-])
-
-AC_DEFUN([KDE_TRY_LINK_PYTHON],
-[
-if test "$kde_python_link_found" = no; then
-
-if test "$1" = normal; then
-  AC_MSG_CHECKING(if a Python application links)
-else
-  AC_MSG_CHECKING(if Python depends on $2)
-fi
-
-AC_CACHE_VAL(kde_cv_try_link_python_$1,
-[
-kde_save_cflags="$CFLAGS"
-CFLAGS="$CFLAGS $PYTHONINC"
-kde_save_libs="$LIBS"
-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
-kde_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-AC_TRY_LINK(
-[
-#include <Python.h>
-],[
-	PySys_SetArgv(1, 0);
-],
-	[kde_cv_try_link_python_$1=yes],
-	[kde_cv_try_link_python_$1=no]
-)
-CFLAGS="$kde_save_cflags"
-LIBS="$kde_save_libs"
-LDFLAGS="$kde_save_ldflags"
-])
-
-if test "$kde_cv_try_link_python_$1" = "yes"; then
-  AC_MSG_RESULT(yes)
-  kde_python_link_found=yes
-  if test ! "$1" = normal; then
-    LIBPYTHON="$LIBPYTHON $2"
-  fi
-  $3
-else
-  AC_MSG_RESULT(no)
-  $4
-fi
-
-fi
-
-])
-
-AC_DEFUN([KDE_CHECK_PYTHON_DIR],
-[
-AC_MSG_CHECKING([for Python directory])
- 
-AC_CACHE_VAL(kde_cv_pythondir,
-[
-  if test -z "$PYTHONDIR"; then
-    kde_cv_pythondir=/usr/local
-  else
-    kde_cv_pythondir="$PYTHONDIR"
-  fi
-])
- 
-AC_ARG_WITH(pythondir,
-AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]),
-[
-  ac_python_dir=$withval
-], ac_python_dir=$kde_cv_pythondir
-)
- 
-AC_MSG_RESULT($ac_python_dir)
-])
-
-AC_DEFUN([KDE_CHECK_PYTHON_INTERN],
-[
-AC_REQUIRE([KDE_CHECK_LIBDL])
-AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-AC_REQUIRE([KDE_CHECK_PYTHON_DIR])
-
-if test -z "$1"; then
-  version="1.5"
-else
-  version="$1"
-fi
-
-AC_MSG_CHECKING([for Python$version])
-
-python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-AC_FIND_FILE(Python.h, $python_incdirs, python_incdir)
-if test ! -r $python_incdir/Python.h; then
-  AC_FIND_FILE(python$version/Python.h, $python_incdirs, python_incdir)
-  python_incdir=$python_incdir/python$version
-  if test ! -r $python_incdir/Python.h; then
-    python_incdir=no
-  fi
-fi
-
-PYTHONINC=-I$python_incdir
-
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
-if test ! -r $python_libdir/libpython$version.so; then
-  AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
-  if test ! -r $python_libdir/libpython$version.a; then
-    AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir)
-    python_libdir=$python_libdir/python$version/config
-    if test ! -r $python_libdir/libpython$version.a; then
-      python_libdir=no
-    fi
-  fi
-fi
-
-PYTHONLIB=-L$python_libdir
-kde_orig_LIBPYTHON=$LIBPYTHON
-if test -z "$LIBPYTHON"; then
-  LIBPYTHON=-lpython$version
-fi
-
-AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-python_moddir=$python_moddir/python$version
-if test ! -r $python_moddir/copy.py; then
-  python_moddir=no
-fi
-
-PYTHONMODDIR=$python_moddir
-
-AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir)
-
-if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-   LIBPYTHON=$kde_orig_LIBPYTHON
-   test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-   test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-   $2
-else 
-  dnl Note: this test is very weak
-  kde_python_link_found=no
-  KDE_TRY_LINK_PYTHON(normal)
-  KDE_TRY_LINK_PYTHON(m, -lm)
-  KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD)
-  KDE_TRY_LINK_PYTHON(tcl, -ltcl)
-  KDE_TRY_LINK_PYTHON(db2, -ldb2)
-  KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm])
-  KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil])
-  KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil])
-  KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3])
-  KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil])
-  KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm])
-  KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm -lpanel -lcurses])
-  KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
-	[AC_MSG_WARN([it seems, Python depends on another library.
-    Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-    and contact the authors to let them know about this problem])
-	])
-
-  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-  AC_SUBST(PYTHONINC)
-  AC_SUBST(PYTHONLIB)
-  AC_SUBST(LIBPYTHON)
-  AC_SUBST(PYTHONMODDIR)
-  AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python])
-fi
-
-])
-
-
-AC_DEFUN([KDE_CHECK_PYTHON],
-[
-  KDE_CHECK_PYTHON_INTERN("2.3", 
-   [KDE_CHECK_PYTHON_INTERN("2.2", 
-     [KDE_CHECK_PYTHON_INTERN("2.1", 
-       [KDE_CHECK_PYTHON_INTERN("2.0", 
-         [KDE_CHECK_PYTHON_INTERN($1, $2) ])
-       ])
-     ])
-   ])
-])
-
-AC_DEFUN([KDE_CHECK_STL],
-[
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-
-    AC_MSG_CHECKING([if C++ programs can be compiled])
-    AC_CACHE_VAL(kde_cv_stl_works,
-    [
-      AC_TRY_COMPILE([
-#include <string>
-using namespace std;
-],[
-  string astring="Hallo Welt.";
-  astring.erase(0, 6); // now astring is "Welt"
-  return 0;
-], kde_cv_stl_works=yes,
-   kde_cv_stl_works=no)
-])
-
-   AC_MSG_RESULT($kde_cv_stl_works)
-
-   if test "$kde_cv_stl_works" = "yes"; then
-     # back compatible
-	 AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
-   else
-	 AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs.
-Check config.log for details - if you're using a Linux distribution you might miss
-a package named similiar to libstd++-dev.])
-   fi
-
-   CXXFLAGS="$ac_save_CXXFLAGS"
-   AC_LANG_RESTORE
-])
-
-AC_DEFUN([AC_FIND_QIMGIO],
-   [AC_REQUIRE([AC_FIND_JPEG])
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for qimgio])
-AC_CACHE_VAL(ac_cv_lib_qimgio,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_save_LIBS="$LIBS"
-ac_save_CXXFLAGS="$CXXFLAGS"
-LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-AC_TRY_RUN(dnl
-[
-#include <qimageio.h>
-#include <qstring.h>
-int main() {
-		QString t = "hallo";
-		t.fill('t');
-		qInitImageIO();
-}
-],
-            ac_cv_lib_qimgio=yes,
-            ac_cv_lib_qimgio=no,
-	    ac_cv_lib_qimgio=no)
-LIBS="$ac_save_LIBS"
-CXXFLAGS="$ac_save_CXXFLAGS"
-AC_LANG_RESTORE
-])dnl
-if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then
-  LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG"
-  AC_MSG_RESULT(yes)
-  AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available])
-  AC_SUBST(LIBQIMGIO)
-else
-  AC_MSG_RESULT(not found)
-fi
-])
-
-AC_DEFUN([AM_DISABLE_LIBRARIES],
-[
-    AC_PROVIDE([AM_ENABLE_STATIC])
-    AC_PROVIDE([AM_ENABLE_SHARED])
-    enable_static=no
-    enable_shared=yes
-])
-
-
-AC_DEFUN([AC_CHECK_UTMP_FILE],
-[
-    AC_MSG_CHECKING([for utmp file])
-
-    AC_CACHE_VAL(kde_cv_utmp_file,
-    [
-    kde_cv_utmp_file=no
-
-    for ac_file in    \
-                      \
-	/var/run/utmp \
-	/var/adm/utmp \
-	/etc/utmp     \
-     ; \
-    do
-     if test -r "$ac_file"; then
-       kde_cv_utmp_file=$ac_file
-       break
-     fi
-    done
-    ])
-
-    if test "$kde_cv_utmp_file" != "no"; then
-	AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-	$1
-	AC_MSG_RESULT($kde_cv_utmp_file)
-    else
-    	$2
-	AC_MSG_RESULT([non found])
-    fi
-])
-
-
-AC_DEFUN([KDE_CREATE_SUBDIRSLIST],
-[
-
-DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
-
-if test ! -s $srcdir/subdirs; then
-  dnl Note: Makefile.common creates subdirs, so this is just a fallback
-  TOPSUBDIRS=""
-  files=`cd $srcdir && ls -1`
-  dirs=`for i in $files; do if test -d $i; then echo $i; fi; done`
-  for i in $dirs; do
-    echo $i >> $srcdir/subdirs
-  done
-fi
-
-ac_topsubdirs=
-if test -s $srcdir/inst-apps; then
-  ac_topsubdirs="`cat $srcdir/inst-apps`"
-elif test -s $srcdir/subdirs; then
-  ac_topsubdirs="`cat $srcdir/subdirs`"
-fi
-
-for i in $ac_topsubdirs; do
-  AC_MSG_CHECKING([if $i should be compiled])
-  if test -d $srcdir/$i; then
-    install_it="yes"
-    for j in $DO_NOT_COMPILE; do
-      if test $i = $j; then
-        install_it="no"
-      fi
-    done
-  else
-    install_it="no"
-  fi
-  AC_MSG_RESULT($install_it)
-  vari=`echo $i | sed -e 's,[[-+.]],_,g'`
-  if test $install_it = "yes"; then
-    TOPSUBDIRS="$TOPSUBDIRS $i"
-    eval "$vari""_SUBDIR_included=yes"
-  else
-    eval "$vari""_SUBDIR_included=no"
-  fi
-done
-
-AC_SUBST(TOPSUBDIRS)
-])
-
-AC_DEFUN([KDE_CHECK_NAMESPACES],
-[
-AC_MSG_CHECKING(whether C++ compiler supports namespaces)
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE([
-],
-[
-namespace Foo {
-  extern int i;
-  namespace Bar {
-    extern int i;
-  }
-}
-
-int Foo::i = 0;
-int Foo::Bar::i = 1;
-],[
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_NAMESPACES)
-], [
-AC_MSG_RESULT(no)
-])
-AC_LANG_RESTORE
-])
-
-dnl ------------------------------------------------------------------------
-dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_CHECK_S_ISSOCK],
-[
-AC_MSG_CHECKING(for S_ISSOCK)
-AC_CACHE_VAL(ac_cv_have_s_issock,
-[
-AC_TRY_LINK(
-[
-#include <sys/stat.h>
-],
-[
-struct stat buff;
-int b = S_ISSOCK( buff.st_mode );
-],
-ac_cv_have_s_issock=yes,
-ac_cv_have_s_issock=no)
-])
-AC_MSG_RESULT($ac_cv_have_s_issock)
-if test "$ac_cv_have_s_issock" = "yes"; then
-  AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.])
-fi
-
-AH_VERBATIM(_ISSOCK,
-[
-#ifndef HAVE_S_ISSOCK
-#define HAVE_S_ISSOCK
-#define S_ISSOCK(mode) (1==0)
-#endif
-])
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_CHECK_KDEMAXPATHLEN],
-[
-AC_MSG_CHECKING(for MAXPATHLEN)
-AC_CACHE_VAL(ac_cv_maxpathlen,
-[
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include <sys/param.h>
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-KDE_HELLO MAXPATHLEN
-
-EOF
-
-ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
-
-if AC_TRY_EVAL(ac_try) && test -s conftest.out; then
-    ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
-else
-    ac_cv_maxpathlen=1024
-fi
-
-rm conftest.*
-
-])
-AC_MSG_RESULT($ac_cv_maxpathlen)
-AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
-])
-
-AC_DEFUN([KDE_CHECK_HEADER],
-[
-   AC_LANG_SAVE
-   kde_safe_cppflags=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $all_includes"
-   AC_LANG_CPLUSPLUS
-   AC_CHECK_HEADER([$1], [$2], [$3], [$4])
-   CPPFLAGS=$kde_safe_cppflags
-   AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_CHECK_HEADERS],
-[
-   AH_CHECK_HEADERS([$1])
-   AC_LANG_SAVE
-   kde_safe_cppflags=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $all_includes"
-   AC_LANG_CPLUSPLUS
-   AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
-   CPPFLAGS=$kde_safe_cppflags
-   AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_FAST_CONFIGURE],
-[
-  dnl makes configure fast (needs perl)
-  AC_ARG_ENABLE(fast-perl, AC_HELP_STRING([--disable-fast-perl],[disable fast Makefile generation (needs perl)]),
-      with_fast_perl=$enableval, with_fast_perl=yes)
-])
-
-AC_DEFUN([KDE_CONF_FILES],
-[
-  val=
-  if test -f $srcdir/configure.files ; then
-    val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files`
-  fi
-  CONF_FILES=
-  if test -n "$val" ; then
-    for i in $val ; do
-      CONF_FILES="$CONF_FILES $i"
-    done
-  fi
-  AC_SUBST(CONF_FILES)
-])dnl
-
-AC_DEFUN([KDE_SET_PREFIX],
-[
-  unset CDPATH
-  dnl make $KDEDIR the default for the installation
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
-
-  if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
-    ac_configure_args="$ac_configure_args --prefix=$prefix"
-  fi
-  # And delete superfluous '/' to make compares easier
-  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-  KDE_FAST_CONFIGURE
-  KDE_CONF_FILES
-])
-
-pushdef([AC_PROG_INSTALL],
-[
-  dnl our own version, testing for a -p flag
-  popdef([AC_PROG_INSTALL])
-  dnl as AC_PROG_INSTALL works as it works we first have
-  dnl to save if the user didn't specify INSTALL, as the
-  dnl autoconf one overwrites INSTALL and we have no chance to find
-  dnl out afterwards
-  test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
-  test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM
-  test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT
-  AC_PROG_INSTALL
-
-  if test -z "$kde_save_INSTALL_given" ; then
-    # OK, user hasn't given any INSTALL, autoconf found one for us
-    # now we test, if it supports the -p flag
-    AC_MSG_CHECKING(for -p flag to install)
-    rm -f confinst.$$.* > /dev/null 2>&1
-    echo "Testtest" > confinst.$$.orig
-    ac_res=no
-    if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then
-      if test -f confinst.$$.new ; then
-        # OK, -p seems to do no harm to install
-	INSTALL="${INSTALL} -p"
-	ac_res=yes
-      fi
-    fi
-    rm -f confinst.$$.*
-    AC_MSG_RESULT($ac_res)
-  fi
-  dnl the following tries to resolve some signs and wonders coming up
-  dnl with different autoconf/automake versions
-  dnl e.g.:
-  dnl  *automake 1.4 install-strip sets A_M_INSTALL_PROGRAM_FLAGS to -s
-  dnl   and has INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(A_M_INSTALL_PROGRAM_FLAGS)
-  dnl   it header-vars.am, so there the actual INSTALL_PROGRAM gets the -s
-  dnl  *automake 1.4a (and above) use INSTALL_STRIP_FLAG and only has
-  dnl   INSTALL_PROGRAM = @INSTALL_PROGRAM@ there, but changes the
-  dnl   install-@DIR@PROGRAMS targets to explicitly use that flag
-  dnl  *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as
-  dnl   INSTALL_SCRIPT, which breaks with automake <= 1.4
-  dnl  *autoconf >2.13 (since 10.Apr 1999) has not that failure
-  dnl  *sometimes KDE does not use the install-@DIR@PROGRAM targets from
-  dnl   automake (due to broken Makefile.am or whatever) to install programs,
-  dnl   and so does not see the -s flag in automake > 1.4
-  dnl to clean up that mess we:
-  dnl  +set INSTALL_PROGRAM to use INSTALL_STRIP_FLAG
-  dnl   which cleans KDE's program with automake > 1.4;
-  dnl  +set INSTALL_SCRIPT to only use INSTALL, to clean up autoconf's problems
-  dnl   with automake<=1.4
-  dnl  note that dues to this sometimes two '-s' flags are used (if KDE
-  dnl   properly uses install-@DIR@PROGRAMS, but I don't care
-  dnl
-  dnl And to all this comes, that I even can't write in comments variable
-  dnl  names used by automake, because it is so stupid to think I wanted to
-  dnl  _use_ them, therefor I have written A_M_... instead of AM_
-  dnl hmm, I wanted to say something ... ahh yes: Arghhh.
-
-  if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-    INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)'
-  fi
-  if test -z "$kde_save_INSTALL_SCRIPT_given" ; then
-    INSTALL_SCRIPT='${INSTALL}'
-  fi
-])dnl
-
-AC_DEFUN([KDE_LANG_CPLUSPLUS],
-[AC_LANG_CPLUSPLUS
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
-pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS])
-])
-
-pushdef([AC_LANG_CPLUSPLUS],
-[popdef([AC_LANG_CPLUSPLUS])
-KDE_LANG_CPLUSPLUS
-])
-
-AC_DEFUN([KDE_CHECK_LONG_LONG],
-[
-AC_MSG_CHECKING(for long long)
-AC_CACHE_VAL(kde_cv_c_long_long,
-[
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_LINK([], [
-  long long foo = 0;
-  foo = foo+1;
-  ],
-  kde_cv_c_long_long=yes, kde_cv_c_long_long=no)
-  AC_LANG_RESTORE
-])
-AC_MSG_RESULT($kde_cv_c_long_long)
-if test "$kde_cv_c_long_long" = yes; then
-   AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have long long as datatype])
-fi
-])
-
-AC_DEFUN([KDE_CHECK_LIB],
-[
-     kde_save_LDFLAGS="$LDFLAGS"
-     dnl AC_CHECK_LIB modifies LIBS, so save it here
-     kde_save_LIBS="$LIBS"
-     LDFLAGS="$LDFLAGS $all_libraries"
-     case $host_os in
-      aix*) LDFLAGS="-brtl $LDFLAGS"
-	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-	;;
-     esac
-     AC_CHECK_LIB($1, $2, $3, $4, $5)
-     LDFLAGS="$kde_save_LDFLAGS"
-     LIBS="$kde_save_LIBS"
-])
-
-AC_DEFUN([KDE_JAVA_PREFIX],
-[
-	dir=`dirname "$1"`
-	base=`basename "$1"`
-	list=`ls -1 $dir 2> /dev/null`
-	for entry in $list; do 
-		if test -d $dir/$entry/bin; then
-			case $entry in
-			   $base)
-				javadirs="$javadirs $dir/$entry/bin"
-				;;
-			esac
-		elif test -d $dir/$entry/jre/bin; then
-			case $entry in
-			   $base)
-				javadirs="$javadirs $dir/$entry/jre/bin"
-				;;
-			esac
-		fi
-	done
-])
-
-dnl KDE_CHEC_JAVA_DIR(onlyjre)
-AC_DEFUN([KDE_CHECK_JAVA_DIR],
-[
-
-AC_ARG_WITH(java,
-AC_HELP_STRING([--with-java=javadir],[use java installed in javadir, --without-java disables]),
-[  ac_java_dir=$withval
-], ac_java_dir=""
-)
-
-AC_MSG_CHECKING([for Java])
-
-dnl at this point ac_java_dir is either a dir, 'no' to disable, or '' to say look in $PATH
-if test "x$ac_java_dir" = "xno"; then
-   kde_java_bindir=no
-   kde_java_includedir=no
-   kde_java_libjvmdir=no
-   kde_java_libgcjdir=no
-   kde_java_libhpidir=no
-else
-  if test "x$ac_java_dir" = "x"; then
-     
-     
-      dnl No option set -> collect list of candidate paths
-      if test -n "$JAVA_HOME"; then
-        KDE_JAVA_PREFIX($JAVA_HOME)
-      fi
-      KDE_JAVA_PREFIX(/usr/j2se)
-      KDE_JAVA_PREFIX(/usr/lib/j2se)
-      KDE_JAVA_PREFIX(/usr/j*dk*)
-      KDE_JAVA_PREFIX(/usr/lib/j*dk*)
-      KDE_JAVA_PREFIX(/opt/j*sdk*)
-      KDE_JAVA_PREFIX(/usr/lib/java*)
-      KDE_JAVA_PREFIX(/usr/java*)
-      KDE_JAVA_PREFIX(/usr/java/j*dk*)
-      KDE_JAVA_PREFIX(/usr/java/j*re*)
-      KDE_JAVA_PREFIX(/usr/lib/SunJava2*)
-      KDE_JAVA_PREFIX(/usr/lib/SunJava*)
-      KDE_JAVA_PREFIX(/usr/lib/IBMJava2*)
-      KDE_JAVA_PREFIX(/usr/lib/IBMJava*)
-      KDE_JAVA_PREFIX(/opt/java*)
-
-      kde_cv_path="NONE"
-      kde_save_IFS=$IFS
-      IFS=':'
-      for dir in $PATH; do
-	  if test -d "$dir"; then
-	      javadirs="$javadirs $dir"
-	  fi
-      done
-      IFS=$kde_save_IFS
-      jredirs=
-
-      dnl Now javadirs contains a list of paths that exist, all ending with bin/
-      for dir in $javadirs; do
-          dnl Check for the java executable
-	  if test -x "$dir/java"; then
-	      dnl And also check for a libjvm.so somewhere under there
-	      dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
-              if test "$dir" != "/usr/bin"; then
-                  libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-		  if test ! -f $libjvmdir/libjvm.so; then continue; fi
-		  jredirs="$jredirs $dir"
-	      fi
-	  fi
-      done
-
-      dnl Now jredirs contains a reduced list, of paths where both java and ../**/libjvm.so was found
-      JAVAC=
-      JAVA=
-      kde_java_bindir=no
-      for dir in $jredirs; do
-	  JAVA="$dir/java"
-	  kde_java_bindir=$dir
-	  if test -x "$dir/javac"; then
-		JAVAC="$dir/javac"
-                break
-	  fi
-      done
-
-      if test -n "$JAVAC"; then
-          dnl this substitution might not work - well, we test for jni.h below
-          kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'`
-      else
-          kde_java_includedir=no
-      fi
-  else
-    dnl config option set
-    kde_java_bindir=$ac_java_dir/bin
-    if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then
-	kde_java_includedir=no
-    else
-        kde_java_includedir=$ac_java_dir/include
-    fi
-  fi
-fi
-
-dnl At this point kde_java_bindir and kde_java_includedir are either set or "no"
-if test "x$kde_java_bindir" != "xno"; then
-
-  dnl Look for libjvm.so
-  kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-  dnl Look for libgcj.so
-  kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
-  dnl Look for libhpi.so and avoid green threads
-  kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
-
-  dnl Now check everything's fine under there
-  dnl the include dir is our flag for having the JDK
-  if test -d "$kde_java_includedir"; then
-    if test ! -x "$kde_java_bindir/javac"; then
-      AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.])
-    fi
-    if test ! -x "$kde_java_bindir/javah"; then
-      AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-    fi
-    if test ! -x "$kde_java_bindir/jar"; then
-      AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-    fi
-    if test ! -r "$kde_java_includedir/jni.h"; then
-      AC_MSG_ERROR([jni.h not found under $kde_java_includedir. Use --with-java or --without-java.])
-    fi
-
-    jni_includes="-I$kde_java_includedir"
-    dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
-    dnl and under linux here.. 
-    
-    dnl not needed for gcj
-
-    if test "x$kde_java_libgcjdir" = "x"; then 
-      test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux"
-      test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris"
-      test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix"
-    fi
-
-  else
-    JAVAC=
-    jni_includes=
-  fi
-
-  if test "x$kde_java_libgcjdir" = "x"; then 
-     if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
-        AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
-     fi 
-  else
-     if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
-        AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.])
-     fi 
-  fi
-
-  if test ! -x "$kde_java_bindir/java"; then
-      AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-  fi
-
-  dnl not needed for gcj compile
-
-  if test "x$kde_java_libgcjdir" = "x"; then 
-      if test ! -r "$kde_java_libhpidir/libhpi.so"; then
-        AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
-      fi
-  fi
-
-  if test -n "$jni_includes"; then
-    dnl Check for JNI version
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_cxxflags_safe="$CXXFLAGS"
-    CXXFLAGS="$CXXFLAGS $all_includes $jni_includes"
-
-    AC_TRY_COMPILE([
-  #include <jni.h>
-	      ],
-	      [
-  #ifndef JNI_VERSION_1_2
-  Syntax Error
-  #endif
-	      ],[ kde_jni_works=yes ],
-	      [ kde_jni_works=no ])
-
-    if test $kde_jni_works = no; then
-      AC_MSG_ERROR([Incorrect version of $kde_java_includedir/jni.h.
-		    You need to have Java Development Kit (JDK) version 1.2. 
-
-		    Use --with-java to specify another location.
-		    Use --without-java to configure without java support.
-		    Or download a newer JDK and try again. 
-		    See e.g. http://java.sun.com/products/jdk/1.2 ])
-    fi
-
-    CXXFLAGS="$ac_cxxflags_safe"    
-    AC_LANG_RESTORE
-
-    dnl All tests ok, inform and subst the variables
-
-    JAVAC=$kde_java_bindir/javac
-    JAVAH=$kde_java_bindir/javah
-    JAR=$kde_java_bindir/jar
-    AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-    if test "x$kde_java_libgcjdir" = "x"; then 
-      JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
-    else
-      JVMLIBS="-L$kde_java_libgcjdir -lgcj"
-    fi
-    AC_MSG_RESULT([java JDK in $kde_java_bindir])
-
-  else
-      AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-      AC_MSG_RESULT([java JRE in $kde_java_bindir])
-  fi
-elif test -d "/Library/Java/Home"; then
-  kde_java_bindir="/Library/Java/Home/bin"
-  jni_includes="-I/Library/Java/Home/include"
-
-  JAVAC=$kde_java_bindir/javac
-  JAVAH=$kde_java_bindir/javah
-  JAR=$kde_java_bindir/jar
-  JVMLIBS="-Xlinker -framework -Xlinker JavaVM"
-
-  AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-  AC_MSG_RESULT([Apple Java Framework])
-else
-  AC_MSG_RESULT([none found])
-fi
-
-AC_SUBST(JAVAC)
-AC_SUBST(JAVAH)
-AC_SUBST(JAR)
-AC_SUBST(JVMLIBS)
-AC_SUBST(jni_includes)
-
-# for backward compat
-kde_cv_java_includedir=$kde_java_includedir
-kde_cv_java_bindir=$kde_java_bindir
-])
-
-dnl this is a redefinition of autoconf 2.5x's AC_FOREACH.
-dnl When the argument list becomes big, as in KDE for AC_OUTPUT in
-dnl big packages, m4_foreach is dog-slow.  So use our own version of
-dnl it.  (matz@kde.org)
-m4_define([mm_foreach],
-[m4_pushdef([$1])_mm_foreach($@)m4_popdef([$1])])
-m4_define([mm_car], [[$1]])
-m4_define([mm_car2], [[$@]])
-m4_define([_mm_foreach],
-[m4_if(m4_quote($2), [], [],
-       [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1],
-                                                   mm_car2(m4_shift($2)),
-                                                   [$3])])])
-m4_define([AC_FOREACH],
-[mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])])
-
-AC_DEFUN([KDE_NEED_FLEX],
-[
-kde_libs_safe=$LIBS
-LIBS="$LIBS $USER_LDFLAGS"
-AM_PROG_LEX
-LIBS=$kde_libs_safe
-if test -z "$LEXLIB"; then
-    AC_MSG_ERROR([You need to have flex installed.])
-fi
-AC_SUBST(LEXLIB)
-])
-
-AC_DEFUN([AC_PATH_QTOPIA],
-[
-  dnl TODO: use AC_CACHE_VAL
-
-  if test -z "$1"; then
-    qtopia_minver_maj=1
-    qtopia_minver_min=5
-    qtopia_minver_pat=0
-  else
-    qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"`
-    qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"`
-    qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"`
-  fi
-
-  qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
-  qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat"
-
-  AC_REQUIRE([AC_PATH_QT])
-
-  AC_MSG_CHECKING([for Qtopia])
-
-  LIB_QTOPIA="-lqpe"
-  AC_SUBST(LIB_QTOPIA)
-
-  kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
-
-  ac_qtopia_incdir=NO
-
-  AC_ARG_WITH(qtopia-dir,
-              AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]),
-              [  ac_qtopia_incdir="$withval"/include] ) 
-  
-  qtopia_incdirs=""
-  for dir in $kde_qtopia_dirs; do
-    qtopia_incdirs="$qtopia_incdirs $dir/include"
-  done
-
-  if test ! "$ac_qtopia_incdir" = "NO"; then
-    qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs"
-  fi
-
-  qtopia_incdir=""
-  AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir)
-  ac_qtopia_incdir="$qtopia_incdir"
-
-  if test -z "$qtopia_incdir"; then
-    AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.])
-  fi
-
-  qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`;
-  qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`;
-  qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`;
-
-  qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat"
-  qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat"
-  if test "$qtopia_ver" -lt "$qtopia_minver"; then
-    AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr
-is required.])
-  fi
-
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-
-  ac_cxxflags_safe="$CXXFLAGS"
-  ac_ldflags_safe="$LDFLAGS"
-  ac_libs_safe="$LIBS"
-
-  CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
-  LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
-
-  cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qpe/qpeapplication.h>
-#include <qpe/version.h>
-
-int main( int argc, char **argv )
-{
-    QPEApplication app( argc, argv );
-    return 0;
-}
-EOF
-
-  if AC_TRY_EVAL(ac_link) && test -s conftest; then
-    rm -f conftest*
-  else
-    rm -f conftest*
-    AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at
-the end of config.log])
-  fi
-
-  CXXFLAGS="$ac_cxxflags_safe"
-  LDFLAGS="$ac_ldflags_safe"
-  LIBS="$ac_libs_safe"
-
-  AC_LANG_RESTORE
-
-  QTOPIA_INCLUDES="-I$qtopia_incdir"
-  AC_SUBST(QTOPIA_INCLUDES)
-
-  AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir])
-])
-
-
-AC_DEFUN([KDE_INIT_DOXYGEN],
-[
-AC_MSG_CHECKING([for Qt docs])
-kde_qtdir=
-if test "${with_qt_dir+set}" = set; then
-  kde_qtdir="$with_qt_dir"
-fi
-
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-AC_MSG_RESULT($QTDOCDIR)
-
-AC_SUBST(QTDOCDIR)
-
-KDE_FIND_PATH(dot, DOT, [], [])
-if test -n "$DOT"; then
-  KDE_HAVE_DOT="YES"
-else
-  KDE_HAVE_DOT="NO"
-fi
-AC_SUBST(KDE_HAVE_DOT)
-KDE_FIND_PATH(doxygen, DOXYGEN, [], [])
-AC_SUBST(DOXYGEN)
-
-DOXYGEN_PROJECT_NAME="$1"
-DOXYGEN_PROJECT_NUMBER="$2"
-AC_SUBST(DOXYGEN_PROJECT_NAME)
-AC_SUBST(DOXYGEN_PROJECT_NUMBER)
-
-KDE_HAS_DOXYGEN=no
-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
-  KDE_HAS_DOXYGEN=yes
-fi
-AC_SUBST(KDE_HAS_DOXYGEN)
-
-])
-
-
-AC_DEFUN([AC_FIND_BZIP2],
-[
-AC_MSG_CHECKING([for bzDecompress in libbz2])
-AC_CACHE_VAL(ac_cv_lib_bzip2,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET"
-kde_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(dnl
-[
-#define BZ_NO_STDIO
-#include<bzlib.h>
-],
-            [ bz_stream s; (void) bzDecompress(&s); ],
-            eval "ac_cv_lib_bzip2='-lbz2'",
-            eval "ac_cv_lib_bzip2=no")
-LIBS="$kde_save_LIBS"
-CXXFLAGS="$kde_save_CXXFLAGS"
-AC_LANG_RESTORE
-])dnl
-AC_MSG_RESULT($ac_cv_lib_bzip2)
-
-if test ! "$ac_cv_lib_bzip2" = no; then
-  BZIP2DIR=bzip2
-
-  LIBBZ2="$ac_cv_lib_bzip2"
-  AC_SUBST(LIBBZ2)
-
-else
-
-   cxx_shared_flag=
-   ld_shared_flag=
-   KDE_CHECK_COMPILER_FLAG(shared, [
-	ld_shared_flag="-shared"
-   ])
-   KDE_CHECK_COMPILER_FLAG(fPIC, [
-        cxx_shared_flag="-fPIC"
-   ])
-
-   AC_MSG_CHECKING([for BZ2_bzDecompress in (shared) libbz2])
-   AC_CACHE_VAL(ac_cv_lib_bzip2_prefix,
-   [
-   AC_LANG_SAVE
-   AC_LANG_CPLUSPLUS
-   kde_save_LIBS="$LIBS"
-   LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET"
-   kde_save_CXXFLAGS="$CXXFLAGS"
-   CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES"
-
-   AC_TRY_LINK(dnl
-   [
-   #define BZ_NO_STDIO
-   #include<bzlib.h>
-   ],
-               [ bz_stream s; (void) BZ2_bzDecompress(&s); ],
-               eval "ac_cv_lib_bzip2_prefix='-lbz2'",
-               eval "ac_cv_lib_bzip2_prefix=no")
-   LIBS="$kde_save_LIBS"
-   CXXFLAGS="$kde_save_CXXFLAGS"
-   AC_LANG_RESTORE
-   ])dnl
-
-   AC_MSG_RESULT($ac_cv_lib_bzip2_prefix)
-   
-   if test ! "$ac_cv_lib_bzip2_prefix" = no; then
-     BZIP2DIR=bzip2
-    
-     LIBBZ2="$ac_cv_lib_bzip2_prefix"
-     AC_SUBST(LIBBZ2)
-
-     AC_DEFINE(NEED_BZ2_PREFIX, 1, [Define if the libbz2 functions need the BZ2_ prefix])
-   dnl else, we just ignore this
-   fi
-
-fi
-AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR")
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the SSL headers and libraries.
-dnl $(SSL_LDFLAGS) will be -Lsslliblocation (if needed)
-dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([KDE_CHECK_SSL],
-[
-LIBSSL="-lssl -lcrypto"
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-ac_ssl_includes=NO ac_ssl_libraries=NO
-ssl_libraries=""
-ssl_includes=""
-AC_ARG_WITH(ssl-dir,
-    AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
-    [  ac_ssl_includes="$withval"/include
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
-    ])
-
-want_ssl=yes
-AC_ARG_WITH(ssl,
-    AC_HELP_STRING([--without-ssl],[disable SSL checks]),
-    [want_ssl=$withval])
-
-if test $want_ssl = yes; then
-
-AC_MSG_CHECKING(for OpenSSL)
-
-AC_CACHE_VAL(ac_cv_have_ssl,
-[#try to guess OpenSSL locations
-  
-  ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes"
-  ssl_incdirs="$ac_ssl_includes $ssl_incdirs"
-  AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
-  ac_ssl_includes="$ssl_incdir"
-
-  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
-  if test ! "$ac_ssl_libraries" = "NO"; then
-    ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
-  fi
-
-  test=NONE
-  ssl_libdir=NONE
-  for dir in $ssl_libdirs; do
-    try="ls -1 $dir/libssl*"
-    if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-  done
-
-  ac_ssl_libraries="$ssl_libdir"
-
-  ac_ldflags_safe="$LDFLAGS"
-  ac_libs_safe="$LIBS"
-
-  LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries"
-  LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref"
-
-  AC_TRY_LINK(,void RSAPrivateEncrypt(void);RSAPrivateEncrypt();,
-  ac_ssl_rsaref="yes"
-  ,
-  ac_ssl_rsaref="no"
-  )
-
-  LDFLAGS="$ac_ldflags_safe"
-  LIBS="$ac_libs_safe"
-
-  if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then
-    have_ssl=no
-  else
-    have_ssl=yes;
-  fi
-
-  ])
-
-  eval "$ac_cv_have_ssl"
-
-  AC_MSG_RESULT([libraries $ac_ssl_libraries, headers $ac_ssl_includes])
-
-  AC_MSG_CHECKING([whether OpenSSL uses rsaref])
-  AC_MSG_RESULT($ac_ssl_rsaref)
-
-  AC_MSG_CHECKING([for easter eggs])
-  AC_MSG_RESULT([none found])
-
-else
-  have_ssl=no
-fi
-
-if test "$have_ssl" = yes; then
-  AC_MSG_CHECKING(for OpenSSL version)
-  dnl Check for SSL version
-  AC_CACHE_VAL(ac_cv_ssl_version,
-  [
-
-    cat >conftest.$ac_ext <<EOF
-#include <openssl/opensslv.h>
-#include <stdio.h>
-    int main() {
- 
-#ifndef OPENSSL_VERSION_NUMBER
-      printf("ssl_version=\\"error\\"\n");
-#else
-      if (OPENSSL_VERSION_NUMBER < 0x00906000)
-        printf("ssl_version=\\"old\\"\n");
-      else
-        printf("ssl_version=\\"ok\\"\n");
-#endif
-     return (0);
-    }
-EOF
-
-    ac_save_CPPFLAGS=$CPPFLAGS
-    if test "$ac_ssl_includes" != "/usr/include"; then
-        CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes"
-    fi
-
-    if AC_TRY_EVAL(ac_link); then 
-
-      if eval `./conftest 2>&5`; then
-        if test $ssl_version = error; then
-          AC_MSG_ERROR([$ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !])
-        else
-          if test $ssl_version = old; then
-            AC_MSG_WARN([OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled.])
-            have_ssl=no
-          fi
-        fi
-        ac_cv_ssl_version="ssl_version=$ssl_version"
-      else
-        AC_MSG_ERROR([Your system couldn't run a small SSL test program.
-        Check config.log, and if you can't figure it out, send a mail to 
-        David Faure <faure@kde.org>, attaching your config.log])
-      fi
-
-    else
-      AC_MSG_ERROR([Your system couldn't link a small SSL test program.
-      Check config.log, and if you can't figure it out, send a mail to 
-      David Faure <faure@kde.org>, attaching your config.log])
-    fi 
-    CPPFLAGS=$ac_save_CPPFLAGS
-
-  ])
-
-  eval "$ac_cv_ssl_version"
-  AC_MSG_RESULT($ssl_version)
-fi
-
-if test "$have_ssl" != yes; then
-  LIBSSL="";
-else
-  AC_DEFINE(HAVE_SSL, 1, [If we are going to use OpenSSL])
-  ac_cv_have_ssl="have_ssl=yes \
-    ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref"
-  
-  
-  ssl_libraries="$ac_ssl_libraries"
-  ssl_includes="$ac_ssl_includes"
-
-  if test "$ac_ssl_rsaref" = yes; then
-    LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref" 
-  fi
-
-  if test $ssl_version = "old"; then
-    AC_DEFINE(HAVE_OLD_SSL_API, 1, [Define if you have OpenSSL < 0.9.6])
-  fi
-fi
-
-SSL_INCLUDES=
-
-if test "$ssl_includes" = "/usr/include"; then
-  if test -f /usr/kerberos/include/krb5.h; then
-	SSL_INCLUDES="-I/usr/kerberos/include"
-  fi
-elif test  "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then
-  SSL_INCLUDES="-I$ssl_includes"
-fi
-
-if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then
- SSL_LDFLAGS=""
-else
- SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
-fi
-
-AC_SUBST(SSL_INCLUDES)
-AC_SUBST(SSL_LDFLAGS)
-AC_SUBST(LIBSSL)
-])
-
-AC_DEFUN([KDE_CHECK_STRLCPY],
-[
-  AC_REQUIRE([AC_CHECK_STRLCAT])
-  AC_REQUIRE([AC_CHECK_STRLCPY])
-  AC_CHECK_SIZEOF(size_t)
-  AC_CHECK_SIZEOF(unsigned long)
-
-  AC_MSG_CHECKING([sizeof size_t == sizeof unsigned long])
-  AC_TRY_COMPILE(,[
-    #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
-       choke me
-    #endif
-    ],AC_MSG_RESULT([yes]),[
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR([
-       Apparently on your system our assumption sizeof size_t == sizeof unsigned long 
-       does not apply. Please mail kde-devel@kde.org with a description of your system!
-      ])
-  ])
-])
-
-AC_DEFUN([KDE_CHECK_BINUTILS],
-[
-  AC_MSG_CHECKING([if ld supports unversioned version maps])
-
-  kde_save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
-  echo "{ local: extern \"C++\" { foo }; };" > conftest.map
-  AC_TRY_LINK([int foo;],
-[
-#ifdef __INTEL_COMPILER
-icc apparently does not support libtools version-info and version-script
-at the same time. Dunno where the bug is, but until somebody figured out,
-better disable the optional version scripts.
-#endif
-
-  foo = 42;
-], kde_supports_versionmaps=yes, kde_supports_versionmaps=no)
-  LDFLAGS="$kde_save_LDFLAGS"
-  rm -f conftest.map
-  AM_CONDITIONAL(include_VERSION_SCRIPT, 
-    [test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"])
-
-  AC_MSG_RESULT($kde_supports_versionmaps)
-])
-
-AC_DEFUN([AM_PROG_OBJC],[
-AC_CHECK_PROGS(OBJC, gcc, gcc)
-test -z "$OBJC" && AC_MSG_ERROR([no acceptable objective-c gcc found in \$PATH])
-if test "x${OBJCFLAGS-unset}" = xunset; then
-   OBJCFLAGS="-g -O2"
-fi
-AC_SUBST(OBJCFLAGS)
-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)])
-])
-
-AC_DEFUN([KDE_CHECK_PERL],
-[
-	KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [
-		    AC_MSG_ERROR([No Perl found in your $PATH.
-We need perl to generate some code.])
-	])
-    AC_SUBST(PERL)
-])
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 47 AC_PROG_LIBTOOL
-
-
-# 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])])])
-
-
-# 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"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-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
-
-# 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
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-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
-])# _LT_AC_SYS_COMPILER
-
-
-# _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
-
-
-# _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)
-  # 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.
-
-  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)
-])])# _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*)
-      LINUX_64_MODE="32"
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*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*)
-      LINUX_64_MODE="64"
-      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
-  testring="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;
-    ;;
-
- *)
-    # 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.
-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      testring=$testring$testring
-    done
-    testring=
-    # 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],
-[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*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
-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
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# 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
-
-   # 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 .
-
-   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* out/*
-   rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# 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
-
-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
-
-
-# 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
-  # 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
-
-
-# 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
-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
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# 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
-   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
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# 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=".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"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-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
-  ;;
-
-bsdi4*)
-  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=".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='$(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
-  ;;
-
-freebsd*-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='.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='.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='.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'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
-      libsuff=64
-    fi
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-  # 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'
-  ;;
-
-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}${release}${shared_ext} ${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=".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
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _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
-
-  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"; 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
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# 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
-
-
-# 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
-
-
-# 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
-
-
-# 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
-
-
-# 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
-
-
-# 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
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# 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
-
-
-# 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
-
-
-# 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])
-])])
-
-
-# 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
-
-*** 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
-
-
-# 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
-  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
-])# 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'
-])# 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
-  ;;
-
-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
-  ;;
-
-cygwin* | mingw* | pw32*)
-  # 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='win32_libid'
-  ;;
-
-darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  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=`/System/Library/Frameworks/System.framework/System`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-  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 $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 must be Linux ELF.
-linux*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
-  arm* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
-  esac
-  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]]+|_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*)
-  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
-  ;;
-
-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
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-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
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# 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")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# 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([AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-
-# 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
-
-
-#
-# 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])
-
-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*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      ;;
-    esac
-    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}'
-    _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)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=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"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# 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([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
-      # KDE requires run time linking.  Make it the default.
-      aix_use_runtimelinking=yes
-      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='-qmkshrobj ${wl}-G'
-	else
-	  shared_flag='-qmkshrobj'
-	fi
-      fi
-    fi
-
-    # Let the compiler handle the export list.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    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_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` '" $shared_flag"
-      _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}$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*)
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep '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 ${wl}-bind_at_load -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 ${wl}-bind_at_load $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 ${wl}-bind_at_load -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}'
-    _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)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  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*)
-    # 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) | egrep "\-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
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_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'
-	_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::"'
-    ;;
-  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|*.$libext)
-       # 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*)
-  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 \
-    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.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# 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=$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='$shrext'
-
-# 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.
-  test -f Makefile && make "$ltmain"
-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'"
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris* | sysv5*)
-  symcode='[[BDT]]'
-  ;;
-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='[[ABCDGISTW]]' ;;
-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
-	;;
-      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*)
-	# 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
-      ;;
-
-    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.
-
-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
-      ;;
-
-    *)
-      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
-
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
-	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='-qmkshrobj ${wl}-G'
-	  else
-	    shared_flag='-qmkshrobj'
-  	fi
-	fi
-      fi
-
-      # Let the compiler handle the export list.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      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_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` '" $shared_flag"
-	_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}$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
-      ;;
-
-    bsdi4*)
-      _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=".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*)
-    if test "$GXX" = yes ; then
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      case "$host_os" in
-      rhapsody* | darwin1.[[012]])
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-	test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep '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 ${wl}-bind_at_load -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 ${wl}-bind_at_load $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 ${wl}-bind_at_load -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}'
-      _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)='-all_load $convenience'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    else  
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    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*)
-      _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(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
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# 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])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-# 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])
-])
-dnl This file was created by Joachim Ansorg <joachim@ansorgs.de>
-dnl It provides macord for the autoconf package to find the Sword library on your system.
-
-dnl ----------------------------------------------------------------------
-dnl		Check wheter to use static linking
-dnl		first parameter is the required version
-dnl		second is whether to use static sword library
-dnl ----------------------------------------------------------------------
-AC_DEFUN(AC_CHECK_SWORD,
-[
-dnl AC_MSG_CHECKING([for a Sword installation])
-
-dnl The option for the configure script
-AC_ARG_WITH(sword-dir,
-[  --with-sword-dir=DIR     Path where Sword is being installed (default=/usr) ],
-[
-  ac_sword_dir=$withval
-],ac_sword_dir=/usr
-)
-
-AC_ARG_ENABLE(static-sword,
-[  --enable-static-sword    Link to the static Sword library],
- 	ac_static_sword="YES",
- 	[ ac_static_sword="$2" ]
-)
-
-dnl try to find Sword library files
-AC_MSG_CHECKING([for Sword library files])
-AC_REQUIRE([AC_FIND_ZLIB])
-ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
-
-if test "x$ac_static_sword" = "xYES"; then
-	SEARCH_LIBS="libsword.a";
-else
-	SEARCH_LIBS="libsword.so libsword.a";
-fi
-
-
-AC_CACHE_VAL(ac_cv_sword_libdir, AC_FIND_FILE($SEARCH_LIBS, $ac_sword_library_dirs, ac_cv_sword_libdir))
-
-if test "x$ac_cv_sword_libdir" = "xNO"; then
-  AC_MSG_ERROR(SWORD library not found. Try to use configure with --with-sword-dir=/your/SWORD/path!);
-fi
-
-if test "x$ac_static_sword" = "xYES"; then
-	LIB_SWORD="$ac_cv_sword_libdir/libsword.a";
-else
-	LIB_SWORD="-lsword";
-fi
-
-AC_SUBST(SWORD_LIBRARY_PATH)
-AC_SUBST(LIB_SWORD)
-all_libraries="$all_libraries -L$ac_cv_sword_libdir"
-
-if test "x$ac_static_sword" = "xYES"; then
-	MESSAGE="static library $ac_cv_sword_libdir/libsword.a";
-else
-	MESSAGE="$ac_cv_sword_libdir";
-fi
-AC_MSG_RESULT([$MESSAGE])
-
-dnl -- try to find Swords include files --
-AC_MSG_CHECKING([for Sword include files])
-ac_sword_include_dirs="$ac_sword_dir/include/sword $ac_sword_dir/include /usr/include/sword /usr/include /usr/local/include/sword /usr/local/include /usr/local/sword/include /usr/local/sword/include/sword"
-
-AC_CACHE_VAL(ac_cv_sword_incdir, AC_FIND_FILE(swmgr.h, $ac_sword_include_dirs, ac_cv_sword_incdir))
-
-if test "x$ac_cv_sword_incdir" = "xNO"; then
-	AC_MSG_ERROR([The Sword include file files were not found.
-Please try to use configure with --with-sword-dir=/your/SWORD/path !
-])
-fi
-
-SWORD_INCLUDES="-I$ac_cv_sword_incdir"
-AC_SUBST(SWORD_INCLUDES)
-all_includes="$all_includes -I$ac_cv_sword_incdir"
-
-AC_MSG_RESULT([$ac_cv_sword_incdir])
-
-
-
-dnl -- Sword version tests --
-dnl First test for installed Sword version
-dnl Then check if it's recent enough
-
-AC_MSG_CHECKING([for installed Sword version])
-
-AC_CACHE_VAL(ac_cv_installed_sword_version,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$"
-LDFLAGS="$LDFLAGS -L$ac_cv_sword_libdir"
-LIBS="$LIB_SWORD -lz"
-LD_LIBRARY_PATH="$ac_cv_sword_libdir"
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-cat > conftest.$ac_ext <<EOF
-#include <iostream>
-#include <swversion.h>
-
-#ifdef SWORD_NAMESPACE_START
-using namespace sword;
-#endif
-
-int main(int argc, char* argv[]) {
-	std::cout << SWVersion::currentVersion << std::endl;
-	return 0;
-}
-EOF
-
-
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-	if test -x conftest; then
-		eval ac_cv_installed_sword_version=`./conftest 2>&5`
-	fi
-else
-  echo "configure: failed program was:" >&AC_FD_CC
-  AC_MSG_ERROR([Failed to compile the test program to check the Sword version! Please have a look at config.log! Report this to the BibleTime developers!]);
-  cat conftest.$ac_ext >&AC_FD_CC
-fi
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT([$ac_cv_installed_sword_version])
-
-
-
-
-dnl *** Now check if the installed version is recent enough
-AC_MSG_CHECKING([whether your Sword installation is recent enough])
-
-AC_CACHE_VAL(ac_cv_sword_recent_version,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$"
-LDFLAGS="$LDFLAGS -L$ac_cv_sword_libdir"
-LIBS="$LIB_SWORD -lz"
-LD_LIBRARY_PATH="$ac_cv_sword_libdir"
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-cat > conftest.$ac_ext <<EOF
-#include <iostream>
-#include <swversion.h>
-
-#ifdef SWORD_NAMESPACE_START
-using namespace sword;
-#endif
-
-
-int main(int argc, char* argv[[]]) {
-	if (argc == 2) { //compare required with installed Sword version
-		const char* requiredVersion( argv[[1]] );
-		if ( (SWVersion( requiredVersion ) < SWVersion::currentVersion) || (SWVersion( requiredVersion ) == SWVersion::currentVersion) ) {
-			std::cout << "ok";
-			return -1;
-		}
-		else {
-			std::cout << "not-ok";
-			return -2; //version not recent enough
-		}
-	}
-	return 0;
-}
-EOF
-
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-	if test -x conftest; then
-		eval ac_cv_sword_recent_version=`./conftest $1 2>&5`
-	fi
-else
-  echo "configure: failed program was:" >&AC_FD_CC
-  AC_MSG_ERROR([Failed to compile the test program to check the Sword version! Please have a look at config.log! Report this to the BibleTime developers!]);
-  cat conftest.$ac_ext >&AC_FD_CC
-fi;
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_RESTORE
-])
-
-if test "x$ac_cv_sword_recent_version" = "xok"; then
-	AC_MSG_RESULT([yes]);
-elif test "x$ac_cv_sword_recent_version" = "xnot-ok"; then
-	AC_MSG_RESULT([no]);
-	AC_MSG_ERROR([Your Sword installation is not recent enought! Please upgrade to version $1! Get the Sword library at www.crosswire.org.]);
-else
-	AC_MSG_ERROR([Invalid return code of the internal Sword version test program. Please submit a bugreport!]);
-fi;
-
-])
-
-dnl -------------------------------------------------------------------------------
-dnl		Check wheter to use static linking, first parameter is the result (YES/NO)
-dnl -------------------------------------------------------------------------------
-AC_DEFUN(AC_CHECK_STATIC_LINKING,
-[
-$1="NO"
-
-AC_MSG_CHECKING(whether to use static linking)
-AC_ARG_ENABLE(static-linking,
-      [  --enable-static-linking	use static linking],
-      USE_STATIC_LINKING=$enableval, USE_STATIC_LINKING="no")
-
-if test "$USE_STATIC_LINKING" = "yes"; then
-	BT_LDFLAGS="-all-static -Wl,-Bstatic";
-	AC_SUBST(BT_LDFLAGS)
-	CPPFLAGS="-DSTATIC_BUILD $CPPFLAGS";
-	$1="YES";
-else
-	$1="NO";
-fi
-
-AC_MSG_RESULT($USE_STATIC_LINKING)
-])
-
-dnl -------------------------------------------------------------------------------
-dnl		Checks the type of the distribution
-dnl		Possible names for the distributions are SuSE, RedHat, Mandrake
-dnl -------------------------------------------------------------------------------
-AC_DEFUN(AC_CHECK_DISTRIBUTION,
-[
-AC_MSG_CHECKING([for the used Linux distribution])
-
-AC_ARG_WITH(distribution,
-[  --with-distribution=TYPE     The name of your *NIX distribution, e.g. SuSE [auto] ],
-[
-  ac_distribution=$withval
-],ac_distribution=auto
-)
-
-AC_ARG_WITH(distribution-version,
-[  --with-distribution-version=VERSION     Version of your *NIX distribution, e.g. 7.2 [auto] ],
-[
-  ac_distribution_version=$withval
-],ac_distribution_version=auto
-)
-
-AC_ARG_WITH(rpm-prefix,
-[  --with-rpm-prefix=DIR    The directory which should be used as PREFIX
-														in the RPM spec file [auto] ],
-[
-  ac_rpm_prefix=$withval
-],ac_rpm_prefix=auto
-)
-
-AC_ARG_WITH(rpm-group,
-[  --with-rpm-group=DIR     The group which will be used for the RPM system [auto] ],
-[
-  ac_rpm_group=$withval
-],ac_rpm_group=auto
-)
-
-if test "$ac_distribution" != "auto"; then
-	DISTRIBUTION=[$ac_distribution]
-fi
-
-if test "$ac_distribution" = "auto"; then
-AC_CACHE_VAL(DISTRIBUTION, [
-if test -f "/etc/SuSE-release"; then
-	DISTRIBUTION="SuSE"
-elif test -f "/etc/mandrake-release"; then
-	DISTRIBUTION="Mandrake"
-elif test -f "/etc/redhat-release"; then
-	DISTRIBUTION="Red Hat"
-elif test -f "/etc/debian_version"; then
-	DISTRIBUTION="Debian"
-fi
-])
-fi
-
-if test "$ac_distribution_version" != "auto"; then
-	DISTRIBUTION_VERSION=[$ac_distribution_version]
-fi
-if test "$ac_distribution_version" = "auto"; then
-AC_CACHE_VAL(DISTRIBUTION_VERSION, [
-if test -f "/etc/SuSE-release" && test "$DISTRIBUTION" = "SuSE"; then
-	DISTRIBUTION_VERSION=[`grep "VERSION =" /etc/SuSE-release | sed 's/VERSION = //'`];	
-elif test -f "/etc/mandrake-release" && test "$DISTRIBUTION" = "Mandrake"; then
-	DISTRIBUTION_VERSION=[`grep "Mandrake" /etc/mandrake-release | sed 's/[a-zA-Z()]*//g' | awk '{print $1}'`]
-elif test -f "/etc/redhat-release" && test "$DISTRIBUTION" = "Red Hat"; then
-	DISTRIBUTION_VERSION=[`grep "Red Hat" /etc/redhat-release | sed 's/[a-zA-Z()]*//g' | awk '{print $1}'`]
-elif test -f "/etc/debian_version" && test "$DISTRIBUTION" = "Debian"; then
-	DISTRIBUTION_VERSION=[`cat /etc/debian_version`]
-fi
-])
-fi
-
-
-if test "$ac_rpm_prefix" != "auto"; then
-	RPM_PREFIX=[$ac_rpm_prefix]
-fi
-if test "$ac_rpm_prefix" = "auto"; then
-AC_CACHE_VAL(RPM_PREFIX, [
-if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_PREFIX="/opt/kde3"
-elif test "$DISTRIBUTION" = "Mandrake"; then
-	RPM_PREFIX="/usr"	
-elif test "$DISTRIBUTION" = "Red Hat"; then
-	RPM_PREFIX="/usr"		
-elif test "$DISTRIBUTION" = "Debian"; then
-	RPM_PREFIX="/usr"
-fi
-])
-fi
-
-if test "$ac_rpm_group" != "auto"; then
-	RPM_GROUP=[$ac_rpm_group]
-fi
-if test "$ac_rpm_prefix" = "auto"; then
-AC_CACHE_VAL(RPM_GROUP,
-[
-if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_GROUP="X11/KDE/Applications"
-elif test "$DISTRIBUTION" = "Mandrake"; then
-	RPM_GROUP="Graphical desktop/KDE"
-elif test "$DISTRIBUTION" = "Red Hat"; then
-	RPM_GROUP="Graphical desktop/KDE"
-elif test "$DISTRIBUTION" = "Debian"; then
-	RPM_GROUP="Graphical desktop/KDE"
-fi
-])
-fi
-
-if test -n "$DISTRIBUTION" && test "$DISTRIBUTION" != "unknown"; then
-	AC_DEFINE_UNQUOTED(DISTRIBUTION, ${DISTRIBUTION}, [The type of your distribution])
-fi
-
-if test -n "$DISTRIBUTION_VERSION"  && test "$DISTRIBUTION_VERSION" != "unknown"; then
-	AC_DEFINE_UNQUOTED(DISTRIBUTION_VERSION, ${DISTRIBUTION_VERSION}, [The version of your distribution])
-fi
-
-AC_SUBST(DISTRIBUTION)
-AC_SUBST(DISTRIBUTION_VERSION)
-AC_SUBST(RPM_PREFIX)
-AC_SUBST(RPM_GROUP)
-
-AC_MSG_RESULT([$DISTRIBUTION $DISTRIBUTION_VERSION])
-
-AC_MSG_CHECKING([for RPM installation prefix])
-AC_MSG_RESULT([$RPM_PREFIX])
-
-AC_MSG_CHECKING([for the correct RPM group])
-AC_MSG_RESULT([$RPM_GROUP])
-])
-
-
-
-
-dnl MY_CURL
-dnl -------
-dnl set my_cv_curl_vers to the version of libcurl or NONE
-dnl if libcurl is not found or is too old
-dnl This function comes from cURL's webpage
-
-AC_DEFUN(AC_CHECK_CURL,[
- AC_CACHE_VAL(my_cv_curl_vers,[
- my_cv_curl_vers=NONE
- dnl check is the plain-text version of the required version
- check="7.9"
- dnl check_hex must be UPPERCASE if any hex letters are present
- check_hex="070900"
-
- AC_MSG_CHECKING([for curl >= $check])
-
- if eval curl-config --version 2>/dev/null >/dev/null; then
-   ver=`curl-config --version | sed -e "s/libcurl //g"`
-   hex_ver=`curl-config --vernum | tr 'a-f' 'A-F'`
-   ok=`echo "ibase=16; if($hex_ver>=$check_hex) $hex_ver else 0" | bc`
-
-   if test x$ok != x0; then
-     my_cv_curl_vers="$ver"
-     AC_MSG_RESULT([$my_cv_curl_vers])
-   else
-     AC_MSG_RESULT(FAILED)
-		 AC_MSG_ERROR([$ver is too old. Please install libcurl version $check or higher.]);
-   fi
- else
-   AC_MSG_RESULT(FAILED)
-   AC_MSG_ERROR([curl-config was not found. Please install libcurl version $check or higher.])
- fi
- ])
-])
-
-# AM_CONDITIONAL                                              -*- Autoconf -*-
-
-# Copyright 1997, 2000, 2001 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 5
-
-AC_PREREQ(2.52)
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[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])])
-
-# 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
-# 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 10
-
-AC_PREREQ([2.54])
-
-# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
-# the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-
-# 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_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_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-# 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([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
-])
-])
-
-
-# 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])
-
-# Copyright 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, 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
-
-# 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.7"])
-
-# 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.7.6])])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright 2001, 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, 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_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])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright 1996, 1997, 2000, 2001 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 3
-
-# 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
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-#  -*- Autoconf -*-
-
-
-# Copyright 1997, 1999, 2000, 2001 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 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_AUX_DIR_EXPAND
-
-# Copyright 2001 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.
-
-# 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.
-
-# Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_AUX_DIR_EXPAND], [
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-
-# Copyright 2001 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)])
-
-# AM_PROG_INSTALL_STRIP
-
-# Copyright 2001 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])])
-
-#                                                          -*- 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.
-
-# 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
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# serial 5						-*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 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.
-
-
-# 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...
-
-
-
-# _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
-      : > 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
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' 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])
-])
-
-
-# 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
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking Speeds up one-time builds
-  --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])
-])
-
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
-
-# Copyright 1999, 2000, 2001, 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, 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_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
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # 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 -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //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
-
-
-# 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"])
-])
-
-# 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
-# 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
-])
-
-
-# Copyright 1998, 1999, 2000, 2001, 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, 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
-
-AC_PREREQ(2.50)
-
-# AM_PROG_LEX
-# -----------
-# Autoconf leaves LEX=: if lex or flex can't be found.  Change that to a
-# "missing" invocation, for better error output.
-AC_DEFUN([AM_PROG_LEX],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])dnl
-AC_REQUIRE([AC_PROG_LEX])dnl
-if test "$LEX" = :; then
-  LEX=${am_missing_run}flex
-fi])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright 1996, 1997, 2000, 2001 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_PREREQ([2.52])
-
-# serial 6
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# Copyright 1996, 1998, 2000, 2001, 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, 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
-
-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])
-
diff --git a/admin/Makefile.common b/admin/Makefile.common
deleted file mode 100644
index 0ecd10d..0000000
--- a/admin/Makefile.common
+++ /dev/null
@@ -1,35 +0,0 @@
-### Makefile.common
-###
-### Copyright (C) 2002 by the KDE developers
-
-### All the real work is done by the shellscript cvs.sh
-
-SHELL=/bin/sh
-
-cvs dist cvs-clean configure configure.in configure.files subdirs package-messages package-merge Makefile.am acinclude.m4:
-	@admindir=$(admindir); \
-	if test "x$$admindir" = x; then \
-	  admindir=.; until test -f $$admindir/admin/cvs.sh; do \
-	    admindir=$$admindir/..; \
-	    if test `cd $$admindir && pwd` = / ; then break; fi; \
-	  done; \
-	  admindir=$$admindir/admin; \
-	  if test -f $$admindir/cvs.sh; then :; else \
-	    echo "Can't find the admin/ directory in any parent of the"; \
-	    echo "current directory.  Please set it with admindir=..."; \
-	    exit 1; \
-	  fi; \
-	fi; \
-	if test "$@" = "package-merge"; then \
-		MAKE="$(MAKE)" POFILES="$(POFILES)" PACKAGE="$(PACKAGE)" \
-	  	$(SHELL) $$admindir/cvs.sh package-merge ;\
-	else \
-		MAKE="$(MAKE)" $(SHELL) $$admindir/cvs.sh $@ ;\
-	fi
-
-configure.in: configure.files subdirs
-configure.files: subdirs
-
-.SILENT:
-
-.PHONY: cvs dist cvs-clean package-merge package-messages
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
deleted file mode 100644
index 86b4305..0000000
--- a/admin/acinclude.m4.in
+++ /dev/null
@@ -1,5353 +0,0 @@
-##   -*- autoconf -*-
-
-dnl    This file is part of the KDE libraries/packages
-dnl    Copyright (C) 1997 Janos Farkas (chexum@shadow.banki.hu)
-dnl              (C) 1997,98,99 Stephan Kulow (coolo@kde.org)
-
-dnl    This file is free software; you can redistribute it and/or
-dnl    modify it under the terms of the GNU Library General Public
-dnl    License as published by the Free Software Foundation; either
-dnl    version 2 of the License, or (at your option) any later version.
-
-dnl    This library is distributed in the hope that it will be useful,
-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl    Library General Public License for more details.
-
-dnl    You should have received a copy of the GNU Library General Public License
-dnl    along with this library; see the file COPYING.LIB.  If not, write to
-dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl    Boston, MA 02111-1307, USA.
-
-dnl IMPORTANT NOTE:
-dnl Please do not modify this file unless you expect your modifications to be
-dnl carried into every other module in the repository. 
-dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
-
-# KDE_PATH_X_DIRECT
-dnl Internal subroutine of AC_PATH_X.
-dnl Set ac_x_includes and/or ac_x_libraries.
-AC_DEFUN([KDE_PATH_X_DIRECT],
-[
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-  # First, try using that file with no special directory specified.
-AC_TRY_CPP([#include <$x_direct_test_include>],
-[# We can compile using X headers with no special include directory.
-ac_x_includes=],
-[# Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done])
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
-  # Check for the libraries.
-
-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS="$LIBS"
-  LIBS="-l$x_direct_test_library $LIBS"
-AC_TRY_LINK(, [${x_direct_test_function}()],
-[LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=],
-[LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-    /usr/X11/lib${kdelibsuff}           \
-    /usr/X11R6/lib${kdelibsuff}         \
-    /usr/X11R5/lib${kdelibsuff}         \
-    /usr/X11R4/lib${kdelibsuff}         \
-                                        \
-    /usr/lib${kdelibsuff}/X11           \
-    /usr/lib${kdelibsuff}/X11R6         \
-    /usr/lib${kdelibsuff}/X11R5         \
-    /usr/lib${kdelibsuff}/X11R4         \
-                                        \
-    /usr/local/X11/lib${kdelibsuff}     \
-    /usr/local/X11R6/lib${kdelibsuff}   \
-    /usr/local/X11R5/lib${kdelibsuff}   \
-    /usr/local/X11R4/lib${kdelibsuff}   \
-                                        \
-    /usr/local/lib${kdelibsuff}/X11     \
-    /usr/local/lib${kdelibsuff}/X11R6   \
-    /usr/local/lib${kdelibsuff}/X11R5   \
-    /usr/local/lib${kdelibsuff}/X11R4   \
-                                        \
-    /usr/X386/lib${kdelibsuff}          \
-    /usr/x386/lib${kdelibsuff}          \
-    /usr/XFree86/lib${kdelibsuff}/X11   \
-                                        \
-    /usr/lib${kdelibsuff}               \
-    /usr/local/lib${kdelibsuff}         \
-    /usr/unsupported/lib${kdelibsuff}   \
-    /usr/athena/lib${kdelibsuff}        \
-    /usr/local/x11r5/lib${kdelibsuff}   \
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
-    /lib/usr/lib${kdelibsuff}/X11       \
-                                        \
-    /usr/openwin/lib${kdelibsuff}       \
-    /usr/openwin/share/lib${kdelibsuff} \
-    ; \
-do
-dnl Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done])
-fi # $ac_x_libraries = NO
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find a file (or one of more files in a list of dirs)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
-  for j in $1;
-  do
-    echo "configure: __oline__: $i/$j" >&AC_FD_CC
-    if test -r "$i/$j"; then
-      echo "taking that" >&AC_FD_CC
-      $3=$i
-      break 2
-    fi
-  done
-done
-])
-
-dnl KDE_FIND_PATH(programm-name, variable-name, list of directories,
-dnl	if-not-found, test-parameter)
-AC_DEFUN([KDE_FIND_PATH],
-[
-   AC_MSG_CHECKING([for $1])
-   if test -n "$$2"; then
-        kde_cv_path="$$2";
-   else
-        kde_cache=`echo $1 | sed 'y%./+-%__p_%'`
-
-        AC_CACHE_VAL(kde_cv_path_$kde_cache,
-        [
-        kde_cv_path="NONE"
-	dirs="$3"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/$1"; then
-	    if test -n "$5"
-	    then
-              evalstr="$dir/$1 $5 2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/$1"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/$1"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-        ])
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      AC_MSG_RESULT(not found)
-      $4
-   else
-      AC_MSG_RESULT($kde_cv_path)
-      $2=$kde_cv_path
-
-   fi
-])
-
-AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
-[
-    AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-Please check whether you installed Qt correctly.
-You need to have a running moc binary.
-configure tried to run $ac_cv_path_moc and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable MOC to the right one before running
-configure.
-])
-])
-
-AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
-[
-    AC_MSG_WARN([No Qt ui compiler (uic) found!
-Please check whether you installed Qt correctly.
-You need to have a running uic binary.
-configure tried to run $ac_cv_path_uic and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable UIC to the right one before running
-configure.
-])
-])
-
-
-AC_DEFUN([KDE_CHECK_UIC_FLAG],
-[
-    AC_MSG_CHECKING([whether uic supports -$1 ])
-    kde_cache=`echo $1 | sed 'y% .=/+-%____p_%'`
-    AC_CACHE_VAL(kde_cv_prog_uic_$kde_cache,
-    [
-        cat >conftest.ui <<EOT
-        <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-EOT
-        ac_uic_testrun="$UIC_PATH -$1 $2 conftest.ui >/dev/null"
-        if AC_TRY_EVAL(ac_uic_testrun); then
-            eval "kde_cv_prog_uic_$kde_cache=yes"
-        else
-            eval "kde_cv_prog_uic_$kde_cache=no"
-        fi
-        rm -f conftest*
-    ])
-
-    if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-        AC_MSG_RESULT([yes])
-        :
-        $3
-    else
-        AC_MSG_RESULT([no])
-        :
-        $4
-    fi
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find the meta object compiler and the ui compiler in the PATH,
-dnl in $QTDIR/bin, and some more usual places
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_QT_MOC_UIC],
-[
-   AC_REQUIRE([KDE_CHECK_PERL])
-   qt_bindirs=""
-   for dir in $kde_qt_dirs; do
-      qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
-   done
-   qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
-   if test ! "$ac_qt_bindir" = "NO"; then
-      qt_bindirs="$ac_qt_bindir $qt_bindirs"
-   fi
-
-   KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
-   if test -z "$UIC_NOT_NEEDED"; then
-     KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
-     if test -z "$UIC_PATH" ; then
-       KDE_UIC_ERROR_MESSAGE
-       exit 1
-     else
-       UIC=$UIC_PATH
-
-       if test $kde_qtver = 3; then
-         KDE_CHECK_UIC_FLAG(L,[/nonexistent],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no)
-         KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no)
-
-         if test x$ac_uic_supports_libpath = xyes; then
-             UIC="$UIC -L \$(kde_widgetdir)"
-         fi
-         if test x$ac_uic_supports_nounload = xyes; then
-             UIC="$UIC -nounload"
-         fi
-       fi
-     fi
-   else
-     UIC="echo uic not available: "
-   fi
-
-   AC_SUBST(MOC)
-   AC_SUBST(UIC)
-
-   UIC_TR="i18n"
-   if test $kde_qtver = 3; then
-     UIC_TR="tr2i18n"
-   fi
-
-   AC_SUBST(UIC_TR)
-])
-
-AC_DEFUN([KDE_1_CHECK_PATHS],
-[
-  KDE_1_CHECK_PATH_HEADERS
-
-  KDE_TEST_RPATH=
-
-  if test -n "$USE_RPATH"; then
-
-     if test -n "$kde_libraries"; then
-       KDE_TEST_RPATH="-R $kde_libraries"
-     fi
-
-     if test -n "$qt_libraries"; then
-       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-     fi
-
-     if test -n "$x_libraries"; then
-       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-     fi
-
-     KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-  fi
-
-AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_ERROR([your system fails at linking a small KDE application!
-Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
-For more details about this problem, look at the end of config.log.])
-fi
-
-if eval `KDEDIR= ./conftest 2>&5`; then
-  kde_result=done
-else
-  kde_result=problems
-fi
-
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-kde_have_all_paths=yes
-
-KDE_SET_PATHS($kde_result)
-
-])
-
-AC_DEFUN([KDE_SET_PATHS],
-[
-  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-	kde_htmldir=\"$kde_htmldir\" \
-	kde_appsdir=\"$kde_appsdir\" \
-	kde_icondir=\"$kde_icondir\" \
-	kde_sounddir=\"$kde_sounddir\" \
-	kde_datadir=\"$kde_datadir\" \
-	kde_locale=\"$kde_locale\" \
-	kde_cgidir=\"$kde_cgidir\" \
-	kde_confdir=\"$kde_confdir\" \
-	kde_kcfgdir=\"$kde_kcfgdir\" \
-	kde_mimedir=\"$kde_mimedir\" \
-	kde_toolbardir=\"$kde_toolbardir\" \
-	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-	kde_templatesdir=\"$kde_templatesdir\" \
-	kde_bindir=\"$kde_bindir\" \
-	kde_servicesdir=\"$kde_servicesdir\" \
-	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-	kde_moduledir=\"$kde_moduledir\" \
-	kde_styledir=\"$kde_styledir\" \
-	kde_widgetdir=\"$kde_widgetdir\" \
-	xdg_appsdir=\"$xdg_appsdir\" \
-	xdg_menudir=\"$xdg_menudir\" \
-	xdg_directorydir=\"$xdg_directorydir\" \
-	kde_result=$1"
-])
-
-AC_DEFUN([KDE_SET_DEFAULT_PATHS],
-[
-if test "$1" = "default"; then
-
-  if test -z "$kde_htmldir"; then
-    kde_htmldir='\${datadir}/doc/HTML'
-  fi
-  if test -z "$kde_appsdir"; then
-    kde_appsdir='\${datadir}/applnk'
-  fi
-  if test -z "$kde_icondir"; then
-    kde_icondir='\${datadir}/icons'
-  fi
-  if test -z "$kde_sounddir"; then
-    kde_sounddir='\${datadir}/sounds'
-  fi
-  if test -z "$kde_datadir"; then
-    kde_datadir='\${datadir}/apps'
-  fi
-  if test -z "$kde_locale"; then
-    kde_locale='\${datadir}/locale'
-  fi
-  if test -z "$kde_cgidir"; then
-    kde_cgidir='\${exec_prefix}/cgi-bin'
-  fi
-  if test -z "$kde_confdir"; then
-    kde_confdir='\${datadir}/config'
-  fi
-  if test -z "$kde_kcfgdir"; then
-    kde_kcfgdir='\${datadir}/config.kcfg'
-  fi
-  if test -z "$kde_mimedir"; then
-    kde_mimedir='\${datadir}/mimelnk'
-  fi
-  if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${datadir}/toolbar'
-  fi
-  if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${datadir}/wallpapers'
-  fi
-  if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${datadir}/templates'
-  fi
-  if test -z "$kde_bindir"; then
-    kde_bindir='\${exec_prefix}/bin'
-  fi
-  if test -z "$kde_servicesdir"; then
-    kde_servicesdir='\${datadir}/services'
-  fi
-  if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${datadir}/servicetypes'
-  fi
-  if test -z "$kde_moduledir"; then
-    if test "$kde_qtver" = "2"; then
-      kde_moduledir='\${libdir}/kde2'
-    else
-      kde_moduledir='\${libdir}/kde3'
-    fi
-  fi
-  if test -z "$kde_styledir"; then
-    kde_styledir='\${libdir}/kde3/plugins/styles'
-  fi
-  if test -z "$kde_widgetdir"; then
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
-  fi
-  if test -z "$xdg_appsdir"; then
-    xdg_appsdir='\${datadir}/applications/kde'
-  fi
-  if test -z "$xdg_menudir"; then
-    xdg_menudir='\${sysconfdir}/xdg/menus'
-  fi
-  if test -z "$xdg_directorydir"; then
-    xdg_directorydir='\${datadir}/desktop-directories'
-  fi
-
-  KDE_SET_PATHS(defaults)
-
-else
-
-  if test $kde_qtver = 1; then
-     AC_MSG_RESULT([compiling])
-     KDE_1_CHECK_PATHS
-  else
-     AC_MSG_ERROR([path checking not yet supported for KDE 2])
-  fi
-
-fi
-])
-
-AC_DEFUN([KDE_CHECK_PATHS_FOR_COMPLETENESS],
-[ if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-   test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-   test -z "$kde_datadir" || test -z "$kde_locale"  ||
-   test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
-   test -z "$kde_kcfgdir" ||
-   test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-   test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-   test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-   test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-   test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-   test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-   test "x$kde_have_all_paths" != "xyes"; then
-     kde_have_all_paths=no
-  fi
-])
-
-AC_DEFUN([KDE_MISSING_PROG_ERROR],
-[
-    AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed KDE correctly.
-])
-])
-
-AC_DEFUN([KDE_MISSING_ARTS_ERROR],
-[
-    AC_MSG_ERROR([The important program $1 was not found!
-Please check whether you installed aRts correctly or use
---without-arts to compile without aRts support (this will remove functionality).
-])
-])
-
-AC_DEFUN([KDE_SUBST_PROGRAMS],
-[
-    AC_ARG_WITH(arts,
-        AC_HELP_STRING([--without-arts],[build without aRts [default=yes]]),
-        [build_arts=$withval],
-        [build_arts=yes]
-    )
-    AM_CONDITIONAL(include_ARTS, test "$build_arts" != "no")
-
-        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-        test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-        if test -n "$KDEDIRS"; then
-           kde_save_IFS=$IFS
-           IFS=:
-           for dir in $KDEDIRS; do
-                kde_default_bindirs="$dir/bin $kde_default_bindirs "
-           done
-           IFS=$kde_save_IFS
-        fi
-        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
-        KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
-        KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
-        if test "$build_arts" != "no"; then
-          KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
-          KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
-        fi
-        KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
-        KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
-
-        kde32ornewer=1
-        if test "$kde_qtver" -lt 3; then
-            kde32ornewer=
-        else
-            if test "$kde_qtver" = "3" && test "$kde_qtsubver" -le 1; then
-                kde32ornewer=
-            fi
-        fi
-
-        if test -n "$kde32ornewer"; then
-            KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)])
-            KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
-        fi
-        KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [XMLLINT=""])
-
-        if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
-            AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
-	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
-		KDE_XSL_STYLESHEET=""
-	    else
-                KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl"
-	    fi
-        fi
-
-        DCOP_DEPENDENCIES='$(DCOPIDL)'
-        if test -n "$kde32ornewer"; then
-            KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
-            DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
-            AC_SUBST(KCONFIG_COMPILER)
-            AC_SUBST(KCFG_DEPENDENCIES)
-            AC_SUBST(DCOPIDLNG)
-        fi
-        AC_SUBST(DCOPIDL)
-        AC_SUBST(DCOPIDL2CPP)
-        AC_SUBST(DCOP_DEPENDENCIES)
-        AC_SUBST(MCOPIDL)
-        AC_SUBST(ARTSCCONFIG)
-        AC_SUBST(KDECONFIG)
-	AC_SUBST(MEINPROC)
- 	AC_SUBST(KDE_XSL_STYLESHEET)
-	AC_SUBST(XMLLINT)
-
-        if test -x "$KDECONFIG"; then # it can be "compiled"
-          kde_libs_prefix=`$KDECONFIG --prefix`
-          if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-               AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
-                          This means it has been moved since you installed it.
-                          This won't work. Please recompile kdelibs for the new prefix.
-                          ])
-           fi
-           kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-        else
-           kde_libs_prefix='$(prefix)'
-           kde_libs_htmldir='$(kde_htmldir)'
-        fi
-        AC_SUBST(kde_libs_prefix)
-        AC_SUBST(kde_libs_htmldir)
-])dnl
-
-AC_DEFUN([AC_CREATE_KFSSTND],
-[
-AC_REQUIRE([AC_CHECK_RPATH])
-
-AC_MSG_CHECKING([for KDE paths])
-kde_result=""
-kde_cached_paths=yes
-AC_CACHE_VAL(kde_cv_all_paths,
-[
-  KDE_SET_DEFAULT_PATHS($1)
-  kde_cached_paths=no
-])
-eval "$kde_cv_all_paths"
-KDE_CHECK_PATHS_FOR_COMPLETENESS
-if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
-  # wrong values were cached, may be, we can set better ones
-  kde_result=
-  kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
-  kde_datadir= kde_locale=  kde_cgidir=  kde_confdir= kde_kcfgdir=
-  kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-  kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-  kde_have_all_paths=
-  kde_styledir=
-  kde_widgetdir=
-  xdg_appsdir = xdg_menudir= xdg_directorydir= 
-  KDE_SET_DEFAULT_PATHS($1)
-  eval "$kde_cv_all_paths"
-  KDE_CHECK_PATHS_FOR_COMPLETENESS
-  kde_result="$kde_result (cache overridden)"
-fi
-if test "$kde_have_all_paths" = "no"; then
-  AC_MSG_ERROR([configure could not run a little KDE program to test the environment.
-Since it had compiled and linked before, it must be a strange problem on your system.
-Look at config.log for details. If you are not able to fix this, look at
-http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-(If you're using an egcs version on Linux, you may update binutils!)
-])
-else
-  rm -f conftest*
-  AC_MSG_RESULT($kde_result)
-fi
-
-bindir=$kde_bindir
-
-KDE_SUBST_PROGRAMS
-
-])
-
-AC_DEFUN([AC_SUBST_KFSSTND],
-[
-AC_SUBST(kde_htmldir)
-AC_SUBST(kde_appsdir)
-AC_SUBST(kde_icondir)
-AC_SUBST(kde_sounddir)
-AC_SUBST(kde_datadir)
-AC_SUBST(kde_locale)
-AC_SUBST(kde_confdir)
-AC_SUBST(kde_kcfgdir)
-AC_SUBST(kde_mimedir)
-AC_SUBST(kde_wallpaperdir)
-AC_SUBST(kde_bindir)
-dnl X Desktop Group standards
-AC_SUBST(xdg_appsdir)
-AC_SUBST(xdg_menudir)
-AC_SUBST(xdg_directorydir)
-dnl for KDE 2
-AC_SUBST(kde_templatesdir)
-AC_SUBST(kde_servicesdir)
-AC_SUBST(kde_servicetypesdir)
-AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
-AC_SUBST(kde_styledir)
-AC_SUBST(kde_widgetdir)
-if test "$kde_qtver" = 1; then
-  kde_minidir="$kde_icondir/mini"
-else
-# for KDE 1 - this breaks KDE2 apps using minidir, but
-# that's the plan ;-/
-  kde_minidir="/dev/null"
-fi
-dnl AC_SUBST(kde_minidir)
-dnl AC_SUBST(kde_cgidir)
-dnl AC_SUBST(kde_toolbardir)
-])
-
-AC_DEFUN([KDE_MISC_TESTS],
-[
-   dnl Checks for libraries.
-   AC_CHECK_LIB(util, main, [LIBUTIL="-lutil"]) dnl for *BSD 
-   AC_SUBST(LIBUTIL)
-   AC_CHECK_LIB(compat, main, [LIBCOMPAT="-lcompat"]) dnl for *BSD
-   AC_SUBST(LIBCOMPAT)
-   kde_have_crypt=
-   AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"; kde_have_crypt=yes],
-      AC_CHECK_LIB(c, crypt, [kde_have_crypt=yes], [
-        AC_MSG_WARN([you have no crypt in either libcrypt or libc.
-You should install libcrypt from another source or configure with PAM
-support])
-	kde_have_crypt=no
-      ]))
-   AC_SUBST(LIBCRYPT)
-   if test $kde_have_crypt = yes; then
-      AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1, [Defines if your system has the crypt function])
-   fi
-   AC_CHECK_SOCKLEN_T
-   AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
-   if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      AC_CHECK_LIB(dnet_stub, dnet_ntoa,
-        [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
-   fi
-   AC_CHECK_FUNC(inet_ntoa)
-   if test $ac_cv_func_inet_ntoa = no; then
-     AC_CHECK_LIB(nsl, inet_ntoa, X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl")
-   fi
-   AC_CHECK_FUNC(connect)
-   if test $ac_cv_func_connect = no; then
-      AC_CHECK_LIB(socket, connect, X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS", ,
-        $X_EXTRA_LIBS)
-   fi
-
-   AC_CHECK_FUNC(remove)
-   if test $ac_cv_func_remove = no; then
-      AC_CHECK_LIB(posix, remove, X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix")
-   fi
-
-   # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-   AC_CHECK_FUNC(shmat, ,
-     AC_CHECK_LIB(ipc, shmat, X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"))
-   
-   # more headers that need to be explicitly included on darwin
-   AC_CHECK_HEADERS(sys/types.h stdint.h)
-
-   # darwin requires a poll emulation library
-   AC_CHECK_LIB(poll, poll, LIB_POLL="-lpoll")
-
-   # CoreAudio framework
-   AC_CHECK_HEADER(CoreAudio/CoreAudio.h, [
-     AC_DEFINE(HAVE_COREAUDIO, 1, [Define if you have the CoreAudio API])
-     FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
-   ])
-
-   AC_CHECK_RES_INIT
-   AC_SUBST(LIB_POLL)
-   AC_SUBST(FRAMEWORK_COREAUDIO)
-   LIBSOCKET="$X_EXTRA_LIBS"
-   AC_SUBST(LIBSOCKET)
-   AC_SUBST(X_EXTRA_LIBS)
-   AC_CHECK_LIB(ucb, killpg, [LIBUCB="-lucb"]) dnl for Solaris2.4
-   AC_SUBST(LIBUCB)
-
-   case $host in  dnl this *is* LynxOS specific
-   *-*-lynxos* )
-        AC_MSG_CHECKING([LynxOS header file wrappers])
-        [CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"]
-        AC_MSG_RESULT(disabled)
-        AC_CHECK_LIB(bsd, gethostbyname, [LIBSOCKET="-lbsd"]) dnl for LynxOS
-         ;;
-    esac
-
-   KDE_CHECK_TYPES
-   KDE_CHECK_LIBDL
-   KDE_CHECK_STRLCPY
-
-# darwin needs this to initialize the environment
-AC_CHECK_HEADERS(crt_externs.h)
-AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])])
- 
-AH_VERBATIM(_DARWIN_ENVIRON,
-[
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-])
-
-AH_VERBATIM(_AIX_STRINGS_H_BZERO,
-[
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-])
-
-AC_CHECK_FUNCS([vsnprintf snprintf])
-
-AH_VERBATIM(_TRU64,[
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-])
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Find the header files and libraries for X-Windows. Extended the
-dnl macro AC_PATH_X
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([K_PATH_X],
-[
-AC_REQUIRE([KDE_MISC_TESTS])dnl
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_ARG_ENABLE(
-  embedded,
-  AC_HELP_STRING([--enable-embedded],[link to Qt-embedded, don't use X]),
-  kde_use_qt_emb=$enableval,
-  kde_use_qt_emb=no
-)
-
-AC_ARG_ENABLE(
-  qtopia,
-  AC_HELP_STRING([--enable-qtopia],[link to Qt-embedded, link to the Qtopia Environment]),
-  kde_use_qt_emb_palm=$enableval,
-  kde_use_qt_emb_palm=no
-)
-
-AC_ARG_ENABLE(
-  mac,
-  AC_HELP_STRING([--enable-mac],[link to Qt/Mac (don't use X)]),
-  kde_use_qt_mac=$enableval,
-  kde_use_qt_mac=no
-)
-
-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-
-AC_MSG_CHECKING(for X)
-
-AC_CACHE_VAL(kde_cv_have_x,
-[# One or both of the vars are not set, and there is no cached value.
-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-   kde_x_includes=NO
-else
-   kde_x_includes=$x_includes
-fi
-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-   kde_x_libraries=NO
-else
-   kde_x_libraries=$x_libraries
-fi
-
-# below we use the standard autoconf calls
-ac_x_libraries=$kde_x_libraries
-ac_x_includes=$kde_x_includes
-
-KDE_PATH_X_DIRECT
-dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries.
-dnl Unfortunately, if compiling with the N32 ABI, this is not the correct
-dnl location. The correct location is /usr/lib32 or an undefined value
-dnl (the linker is smart enough to pick the correct default library).
-dnl Things work just fine if you use just AC_PATH_X_DIRECT.
-dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to
-dnl /usr/openwin/include, which doesn't work. /usr/include does work, so
-dnl x_includes should be left alone.
-case "$host" in
-mips-sgi-irix6*)
-  ;;
-*-*-solaris*)
-  ;;
-*)
-  _AC_PATH_X_XMKMF
-  if test -z "$ac_x_includes"; then
-    ac_x_includes="."
-  fi
-  if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib${kdelibsuff}"
-  fi
-esac
-#from now on we use our own again
-
-# when the user already gave --x-includes, we ignore
-# what the standard autoconf macros told us.
-if test "$kde_x_includes" = NO; then
-  kde_x_includes=$ac_x_includes
-fi
-
-# for --x-libraries too
-if test "$kde_x_libraries" = NO; then
-  kde_x_libraries=$ac_x_libraries
-fi
-
-if test "$kde_x_includes" = NO; then
-  AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!])
-fi
-
-if test "$kde_x_libraries" = NO; then
-  AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!])
-fi
-
-# Record where we found X for the cache.
-kde_cv_have_x="have_x=yes \
-         kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-])dnl
-
-eval "$kde_cv_have_x"
-
-if test "$have_x" != yes; then
-  AC_MSG_RESULT($have_x)
-  no_x=yes
-else
-  AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes])
-fi
-
-if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-  X_INCLUDES=""
-  x_includes="."; dnl better than nothing :-
- else
-  x_includes=$kde_x_includes
-  X_INCLUDES="-I$x_includes"
-fi
-
-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
-  X_LDFLAGS=""
-  x_libraries="/usr/lib"; dnl better than nothing :-
- else
-  x_libraries=$kde_x_libraries
-  X_LDFLAGS="-L$x_libraries"
-fi
-all_includes="$X_INCLUDES"
-all_libraries="$X_LDFLAGS"
-
-# Check for libraries that X11R6 Xt/Xaw programs need.
-ac_save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-# check for ICE first), but we must link in the order -lSM -lICE or
-# we get undefined symbols.  So assume we have SM if we have ICE.
-# These have to be linked with before -lX11, unlike the other
-# libraries we check for below, so use a different variable.
-#  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-AC_CHECK_LIB(ICE, IceConnectionNumber,
-  [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS)
-LDFLAGS="$ac_save_LDFLAGS"
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-
-AC_MSG_CHECKING(for libXext)
-AC_CACHE_VAL(kde_cv_have_libXext,
-[
-kde_ldflags_safe="$LDFLAGS"
-kde_libs_safe="$LIBS"
-
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-LIBS="-lXext -lX11 $LIBSOCKET"
-
-AC_TRY_LINK([
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-],
-[
-printf("hello Xext\n");
-],
-kde_cv_have_libXext=yes,
-kde_cv_have_libXext=no
-)
-
-LDFLAGS=$kde_ldflags_safe
-LIBS=$kde_libs_safe
-])
-
-AC_MSG_RESULT($kde_cv_have_libXext)
-
-if test "$kde_cv_have_libXext" = "no"; then
-  AC_MSG_ERROR([We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either.])
-fi
-
-LIB_XEXT="-lXext"
-QTE_NORTTI=""
-
-elif test "$kde_use_qt_emb" = "yes"; then
-  dnl We're using QT Embedded
-  CPPFLAGS=-DQWS
-  CXXFLAGS="$CXXFLAGS -fno-rtti"
-  QTE_NORTTI="-fno-rtti -DQWS"
-  X_PRE_LIBS=""
-  LIB_X11=""
-  LIB_XEXT=""
-  LIB_XRENDER=""
-  LIBSM=""
-  X_INCLUDES=""
-  X_LDFLAGS=""
-  x_includes=""
-  x_libraries=""
-elif test "$kde_use_qt_mac" = "yes"; then
-  dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
-  dnl be included to get the information) --Sam
-  CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
-  CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
-  X_PRE_LIBS=""
-  LIB_X11=""
-  LIB_XEXT=""
-  LIB_XRENDER=""
-  LIBSM=""
-  X_INCLUDES=""
-  X_LDFLAGS=""
-  x_includes=""
-  x_libraries=""
-fi
-AC_SUBST(X_PRE_LIBS)
-AC_SUBST(LIB_X11)
-AC_SUBST(LIB_XRENDER)
-AC_SUBST(LIBSM)
-AC_SUBST(X_INCLUDES)
-AC_SUBST(X_LDFLAGS)
-AC_SUBST(x_includes)
-AC_SUBST(x_libraries)
-AC_SUBST(QTE_NORTTI)
-AC_SUBST(LIB_XEXT)
-
-])
-
-AC_DEFUN([KDE_PRINT_QT_PROGRAM],
-[
-AC_REQUIRE([KDE_USE_QT])
-cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qglobal.h>
-#include <qapplication.h>
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
-EOF
-
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
-#error 1
-#endif
-EOF
-fi
-fi
-
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qcursor.h>
-#include <qstylefactory.h>
-#include <private/qucomextra_p.h>
-EOF
-fi
-
-echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-cat >> conftest.$ac_ext <<EOF
-#error 1
-#endif
-
-int main() {
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-    QStringList *t = new QStringList();
-    Q_UNUSED(t);
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-    QString s;
-    s.setLatin1("Elvis is alive", 14);
-EOF
-fi
-fi
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-    (void)QStyleFactory::create(QString::null);
-    QCursor c(Qt::WhatsThisCursor);
-EOF
-fi
-cat >> conftest.$ac_ext <<EOF
-    return 0;
-}
-EOF
-])
-
-AC_DEFUN([KDE_USE_QT],
-[
-if test -z "$1"; then
-  # Current default Qt version: 3.2
-  kde_qtver=3
-  kde_qtsubver=2
-else
-  kde_qtsubver=`echo "$1" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
-  # following is the check if subversion isnt found in passed argument
-  if test "$kde_qtsubver" = "$1"; then
-    kde_qtsubver=1
-  fi
-  kde_qtver=`echo "$1" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
-  if test "$kde_qtver" = "1"; then
-    kde_qtsubver=42
-  fi
-fi
-
-if test -z "$2"; then
-  if test "$kde_qtver" = "2"; then
-    if test $kde_qtsubver -gt 0; then
-      kde_qt_minversion=">= Qt 2.2.2"
-    else
-      kde_qt_minversion=">= Qt 2.0.2"
-    fi
-  fi
-  if test "$kde_qtver" = "3"; then
-    if test $kde_qtsubver -gt 0; then
-	 if test $kde_qtsubver -gt 1; then
-	    kde_qt_minversion=">= Qt 3.2"
-	 else
-            kde_qt_minversion=">= Qt 3.1 (20021021)"
-         fi
-    else
-      kde_qt_minversion=">= Qt 3.0"
-    fi
-  fi
-  if test "$kde_qtver" = "1"; then
-    kde_qt_minversion=">= 1.42 and < 2.0"
-  fi
-else
-   kde_qt_minversion="$2"
-fi
-
-if test -z "$3"; then
-   if test $kde_qtver = 3; then
-     if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 0x03@VER@00"
-       qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
-       kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
-     else
-       kde_qt_verstring="QT_VERSION >= 300"
-     fi
-   fi
-   if test $kde_qtver = 2; then
-     if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 222"
-     else
-       kde_qt_verstring="QT_VERSION >= 200"
-     fi
-   fi
-   if test $kde_qtver = 1; then
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-   fi
-else
-   kde_qt_verstring="$3"
-fi
-
-if test $kde_qtver = 3; then
-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
-fi
-if test $kde_qtver = 2; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-fi
-if test $kde_qtver = 1; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt"
-fi
-])
-
-AC_DEFUN([KDE_CHECK_QT_DIRECT],
-[
-AC_REQUIRE([KDE_USE_QT])
-AC_MSG_CHECKING([if Qt compiles without flags])
-AC_CACHE_VAL(kde_cv_qt_direct,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_includes"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-else
-LIBS="$LIBQT $LIBSOCKET"
-fi
-LD_LIBRARY_PATH=
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-KDE_PRINT_QT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-  kde_cv_qt_direct="yes"
-else
-  kde_cv_qt_direct="no"
-  echo "configure: failed program was:" >&AC_FD_CC
-  cat conftest.$ac_ext >&AC_FD_CC
-fi
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_RESTORE
-])
-
-if test "$kde_cv_qt_direct" = "yes"; then
-  AC_MSG_RESULT(yes)
-  $1
-else
-  AC_MSG_RESULT(no)
-  $2
-fi
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the Qt headers and libraries.
-dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_PATH_QT_1_3],
-[
-AC_REQUIRE([K_PATH_X])
-AC_REQUIRE([KDE_USE_QT])
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-dnl ------------------------------------------------------------------------
-dnl Add configure flag to enable linking to MT version of Qt library.
-dnl ------------------------------------------------------------------------
-
-AC_ARG_ENABLE(
-  mt,
-  AC_HELP_STRING([--disable-mt],[link to non-threaded Qt (deprecated)]),
-  kde_use_qt_mt=$enableval,
-  [
-    if test $kde_qtver = 3; then
-      kde_use_qt_mt=yes
-    else
-      kde_use_qt_mt=no
-    fi
-  ]
-)
-
-USING_QT_MT=""
-
-dnl ------------------------------------------------------------------------
-dnl If we not get --disable-qt-mt then adjust some vars for the host.
-dnl ------------------------------------------------------------------------
-
-KDE_MT_LDFLAGS=
-KDE_MT_LIBS=
-if test "x$kde_use_qt_mt" = "xyes"; then
-  KDE_CHECK_THREADING
-  if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
-    KDE_MT_LDFLAGS="$USE_THREADS"
-    KDE_MT_LIBS="$LIBPTHREAD"
-  else
-    kde_use_qt_mt=no
-  fi
-fi
-AC_SUBST(KDE_MT_LDFLAGS)
-AC_SUBST(KDE_MT_LIBS)
-
-kde_qt_was_given=yes
-
-dnl ------------------------------------------------------------------------
-dnl If we haven't been told how to link to Qt, we work it out for ourselves.
-dnl ------------------------------------------------------------------------
-if test -z "$LIBQT_GLOB"; then
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    LIBQT_GLOB="libqte.*"
-  else
-    LIBQT_GLOB="libqt.*"
-  fi
-fi
-
-if test -z "$LIBQT"; then
-dnl ------------------------------------------------------------
-dnl If we got --enable-embedded then adjust the Qt library name.
-dnl ------------------------------------------------------------
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    qtlib="qte"
-  else
-    qtlib="qt"
-  fi
-
-  kde_int_qt="-l$qtlib"
-else
-  kde_int_qt="$LIBQT"
-  kde_lib_qt_set=yes
-fi
-
-if test -z "$LIBQPE"; then
-dnl ------------------------------------------------------------
-dnl If we got --enable-palmtop then add -lqpe to the link line
-dnl ------------------------------------------------------------
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    if test "x$kde_use_qt_emb_palm" = "xyes"; then
-      LIB_QPE="-lqpe"
-    else
-      LIB_QPE=""
-    fi
-  else
-    LIB_QPE=""
-  fi
-fi
-
-dnl ------------------------------------------------------------------------
-dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
-dnl ------------------------------------------------------------------------
-
-if test "x$kde_use_qt_mt" = "xyes"; then
-  if test -z "$LIBQT"; then
-    LIBQT="-l$qtlib-mt"
-    kde_int_qt="-l$qtlib-mt"
-  else
-    LIBQT="$qtlib-mt"
-    kde_int_qt="$qtlib-mt"
-  fi
-  LIBQT_GLOB="lib$qtlib-mt.*"
-  USING_QT_MT="using -mt"
-else
-  LIBQT="-l$qtlib"
-fi
-
-if test $kde_qtver != 1; then
-
-  AC_REQUIRE([AC_FIND_PNG])
-  AC_REQUIRE([AC_FIND_JPEG])
-  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-fi
-
-if test $kde_qtver = 3; then
-  AC_REQUIRE([KDE_CHECK_LIBDL])
-  LIBQT="$LIBQT $LIBDL"
-fi
-
-AC_MSG_CHECKING([for Qt])
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-fi
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-qt_libraries=""
-qt_includes=""
-AC_ARG_WITH(qt-dir,
-    AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
-    [  ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
-       ac_qt_bindir="$withval"/bin
-    ])
-
-AC_ARG_WITH(qt-includes,
-    AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
-    [
-       ac_qt_includes="$withval"
-    ])
-
-kde_qt_libs_given=no
-
-AC_ARG_WITH(qt-libraries,
-    AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
-    [  ac_qt_libraries="$withval"
-       kde_qt_libs_given=yes
-    ])
-
-AC_CACHE_VAL(ac_cv_have_qt,
-[#try to guess Qt locations
-
-qt_incdirs=""
-for dir in $kde_qt_dirs; do
-   qt_incdirs="$qt_incdirs $dir/include $dir"
-done
-qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
-if test ! "$ac_qt_includes" = "NO"; then
-   qt_incdirs="$ac_qt_includes $qt_incdirs"
-fi
-
-if test "$kde_qtver" != "1"; then
-  kde_qt_header=qstyle.h
-else
-  kde_qt_header=qglobal.h
-fi
-
-AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
-ac_qt_includes="$qt_incdir"
-
-qt_libdirs=""
-for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
-done
-qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
-if test ! "$ac_qt_libraries" = "NO"; then
-  qt_libdir=$ac_qt_libraries
-else
-  qt_libdirs="$ac_qt_libraries $qt_libdirs"
-  # if the Qt was given, the chance is too big that libqt.* doesn't exist
-  qt_libdir=NONE
-  for dir in $qt_libdirs; do
-    try="ls -1 $dir/${LIBQT_GLOB}"
-    if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-  done
-fi
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-  if test -e "$a"; then
-    LIBQT="$LIBQT ${kde_int_qt}_incremental"
-    break
-  fi
-done
-
-ac_qt_libraries="$qt_libdir"
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
-
-KDE_PRINT_QT_PROGRAM
-
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-  rm -f conftest*
-else
-  echo "configure: failed program was:" >&AC_FD_CC
-  cat conftest.$ac_ext >&AC_FD_CC
-  ac_qt_libraries="NO"
-fi
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-AC_LANG_RESTORE
-if test "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
-  ac_cv_have_qt="have_qt=no"
-  ac_qt_notfound=""
-  missing_qt_mt=""
-  if test "$ac_qt_includes" = NO; then
-    if test "$ac_qt_libraries" = NO; then
-      ac_qt_notfound="(headers and libraries)";
-    else
-      ac_qt_notfound="(headers)";
-    fi
-  else
-    if test "x$kde_use_qt_mt" = "xyes"; then
-       missing_qt_mt="
-Make sure that you have compiled Qt with thread support!"
-       ac_qt_notfound="(library $qtlib-mt)";
-    else
-       ac_qt_notfound="(library $qtlib)";
-    fi
-  fi
-
-  AC_MSG_ERROR([Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-For more details about this problem, look at the end of config.log.$missing_qt_mt])
-else
-  have_qt="yes"
-fi
-])
-
-eval "$ac_cv_have_qt"
-
-if test "$have_qt" != yes; then
-  AC_MSG_RESULT([$have_qt]);
-else
-  ac_cv_have_qt="have_qt=yes \
-    ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
-  AC_MSG_RESULT([libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT])
-
-  qt_libraries="$ac_qt_libraries"
-  qt_includes="$ac_qt_includes"
-fi
-
-if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
-     KDE_CHECK_QT_DIRECT(qt_libraries= ,[])
-fi
-
-AC_SUBST(qt_libraries)
-AC_SUBST(qt_includes)
-
-if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
-else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
-fi
-
-if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
- QT_LDFLAGS=""
-else
- QT_LDFLAGS="-L$qt_libraries"
- all_libraries="$all_libraries $QT_LDFLAGS"
-fi
-test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-
-AC_SUBST(QT_INCLUDES)
-AC_SUBST(QT_LDFLAGS)
-AC_PATH_QT_MOC_UIC
-
-KDE_CHECK_QT_JPEG
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
-else
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
-fi
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-  if test -e "$a"; then
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
-     break
-  fi
-done
-
-AC_SUBST(LIB_QT)
-AC_SUBST(LIB_QPE)
-
-AC_SUBST(kde_qtver)
-])
-
-AC_DEFUN([AC_PATH_QT],
-[
-AC_PATH_QT_1_3
-])
-
-AC_DEFUN([KDE_CHECK_UIC_PLUGINS],
-[
-AC_REQUIRE([AC_PATH_QT_MOC_UIC])
-
-if test x$ac_uic_supports_libpath = xyes; then
-
-AC_MSG_CHECKING([if UIC has KDE plugins available])
-AC_CACHE_VAL(kde_cv_uic_plugins,
-[
-cat > actest.ui << EOF
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>NewConnectionDialog</class>
-<widget class="QDialog">
-   <widget class="KLineEdit">
-        <property name="name">
-           <cstring>testInput</cstring>
-        </property>
-   </widget>
-</widget>
-</UI>
-EOF
-       
-
-
-kde_cv_uic_plugins=no
-kde_line="$UIC_PATH -L $kde_widgetdir"
-if test x$ac_uic_supports_nounload = xyes; then
-   kde_line="$kde_line -nounload"
-fi
-kde_line="$kde_line -impl actest.h actest.ui > actest.cpp"
-if AC_TRY_EVAL(kde_line); then
-	# if you're trying to debug this check and think it's incorrect,
-	# better check your installation. The check _is_ correct - your
-	# installation is not.
-	if test -f actest.cpp && grep -i klineedit actest.cpp > /dev/null; then
-		kde_cv_uic_plugins=yes
-	fi
-fi
-rm -f actest.ui actest.cpp
-])
-
-AC_MSG_RESULT([$kde_cv_uic_plugins])
-if test "$kde_cv_uic_plugins" != yes; then
-	AC_MSG_ERROR([you need to install kdelibs first.])
-fi
-fi
-])
-
-AC_DEFUN([KDE_CHECK_FINAL],
-[
-  AC_ARG_ENABLE(final,
-	AC_HELP_STRING([--enable-final],
-		       [build size optimized apps (experimental - needs lots of memory)]),
-	kde_use_final=$enableval, kde_use_final=no)
-
-  if test "x$kde_use_final" = "xyes"; then
-      KDE_USE_FINAL_TRUE=""
-      KDE_USE_FINAL_FALSE="#"
-   else
-      KDE_USE_FINAL_TRUE="#"
-      KDE_USE_FINAL_FALSE=""
-  fi
-  AC_SUBST(KDE_USE_FINAL_TRUE)
-  AC_SUBST(KDE_USE_FINAL_FALSE)
-])
-
-AC_DEFUN([KDE_CHECK_CLOSURE],
-[
-  AC_ARG_ENABLE(closure,
-		AC_HELP_STRING([--enable-closure],[delay template instantiation]),
-  	kde_use_closure=$enableval, kde_use_closure=no)
-
-  KDE_NO_UNDEFINED=""
-  if test "x$kde_use_closure" = "xyes"; then
-       KDE_USE_CLOSURE_TRUE=""
-       KDE_USE_CLOSURE_FALSE="#"
-#       CXXFLAGS="$CXXFLAGS $REPO"
-  else
-       KDE_USE_CLOSURE_TRUE="#"
-       KDE_USE_CLOSURE_FALSE=""
-       KDE_NO_UNDEFINED=""
-       case $host in 
-         *-*-linux-gnu)
-           KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-                [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-		[KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-		[KDE_NO_UNDEFINED=""])],
-	    [KDE_NO_UNDEFINED=""])
-           ;;
-       esac
-  fi
-  AC_SUBST(KDE_USE_CLOSURE_TRUE)
-  AC_SUBST(KDE_USE_CLOSURE_FALSE)
-  AC_SUBST(KDE_NO_UNDEFINED)
-])
-
-AC_DEFUN([KDE_CHECK_NMCHECK],
-[
-  AC_ARG_ENABLE(nmcheck,AC_HELP_STRING([--enable-nmcheck],[enable automatic namespace cleanness check]),
-	kde_use_nmcheck=$enableval, kde_use_nmcheck=no)
-
-  if test "$kde_use_nmcheck" = "yes"; then
-      KDE_USE_NMCHECK_TRUE=""
-      KDE_USE_NMCHECK_FALSE="#"
-   else
-      KDE_USE_NMCHECK_TRUE="#"
-      KDE_USE_NMCHECK_FALSE=""
-  fi
-  AC_SUBST(KDE_USE_NMCHECK_TRUE)
-  AC_SUBST(KDE_USE_NMCHECK_FALSE)
-])
-
-AC_DEFUN([KDE_EXPAND_MAKEVAR], [
-savex=$exec_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-tmp=$$2
-while $1=`eval echo "$tmp"`; test "x$$1" != "x$tmp"; do tmp=$$1; done
-exec_prefix=$savex
-])
-
-dnl ------------------------------------------------------------------------
-dnl Now, the same with KDE
-dnl $(KDE_LDFLAGS) will be the kdeliblocation (if needed)
-dnl and $(kde_includes) will be the kdehdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_BASE_PATH_KDE],
-[
-AC_REQUIRE([KDE_CHECK_STL])
-AC_REQUIRE([AC_PATH_QT])dnl
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_CHECK_RPATH
-AC_MSG_CHECKING([for KDE])
-
-if test "${prefix}" != NONE; then
-  kde_includes=${includedir}
-  KDE_EXPAND_MAKEVAR(ac_kde_includes, includedir)
-
-  kde_libraries=${libdir}
-  KDE_EXPAND_MAKEVAR(ac_kde_libraries, libdir)
-
-else
-  ac_kde_includes=
-  ac_kde_libraries=
-  kde_libraries=""
-  kde_includes=""
-fi
-
-AC_CACHE_VAL(ac_cv_have_kde,
-[#try to guess kde locations
-
-if test "$kde_qtver" = 1; then
-  kde_check_header="ksock.h"
-  kde_check_lib="libkdecore.la"
-else
-  kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
-fi
-
-if test -z "$1"; then
-
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
-kde_incdirs="$ac_kde_includes $kde_incdirs"
-AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
-ac_kde_includes="$kde_incdir"
-
-if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
-  AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE headers installed. This will fail.
-So, check this please and use another prefix!])
-fi
-
-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
-AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
-ac_kde_libraries="$kde_libdir"
-
-kde_widgetdir=NO
-dnl this might be somewhere else
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
-
-if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-AC_MSG_ERROR([
-in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-So, check this please and use another prefix!])
-fi
-
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-AC_MSG_ERROR([
-I can't find the designer plugins. These are required and should have been installed
-by kdelibs])
-fi
-
-if test -n "$kde_widgetdir"; then
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
-fi
-
-
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then
-  ac_cv_have_kde="have_kde=no"
-else
-  ac_cv_have_kde="have_kde=yes \
-    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-fi
-
-else dnl test -z $1
-
-  ac_cv_have_kde="have_kde=no"
-
-fi
-])dnl
-
-eval "$ac_cv_have_kde"
-
-if test "$have_kde" != "yes"; then
- if test "${prefix}" = NONE; then
-  ac_kde_prefix="$ac_default_prefix"
- else
-  ac_kde_prefix="$prefix"
- fi
- if test "$exec_prefix" = NONE; then
-  ac_kde_exec_prefix="$ac_kde_prefix"
-  AC_MSG_RESULT([will be installed in $ac_kde_prefix])
- else
-  ac_kde_exec_prefix="$exec_prefix"
-  AC_MSG_RESULT([will be installed in $ac_kde_prefix and $ac_kde_exec_prefix])
- fi
-
- kde_libraries="${libdir}"
- kde_includes="${includedir}"
-
-else
-  ac_cv_have_kde="have_kde=yes \
-    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-  AC_MSG_RESULT([libraries $ac_kde_libraries, headers $ac_kde_includes])
-
-  kde_libraries="$ac_kde_libraries"
-  kde_includes="$ac_kde_includes"
-fi
-AC_SUBST(kde_libraries)
-AC_SUBST(kde_includes)
-
-if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes"  || test "$kde_includes" = "/usr/include"; then
- KDE_INCLUDES=""
-else
- KDE_INCLUDES="-I$kde_includes"
- all_includes="$KDE_INCLUDES $all_includes"
-fi
-
-KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
- 
-KDE_LDFLAGS="-L$kde_libraries"
-if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then 
- all_libraries="$all_libraries $KDE_LDFLAGS"
-fi
-
-AC_SUBST(KDE_LDFLAGS)
-AC_SUBST(KDE_INCLUDES)
-
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-all_libraries="$all_libraries $USER_LDFLAGS"
-all_includes="$all_includes $USER_INCLUDES"
-AC_SUBST(all_includes)
-AC_SUBST(all_libraries)
-
-if test -z "$1"; then
-KDE_CHECK_UIC_PLUGINS
-fi
-
-ac_kde_libraries="$kde_libdir"
-
-AC_SUBST(AUTODIRS)
-
-
-])
-
-AC_DEFUN([KDE_CHECK_EXTRA_LIBS],
-[
-AC_MSG_CHECKING(for extra includes)
-AC_ARG_WITH(extra-includes,AC_HELP_STRING([--with-extra-includes=DIR],[adds non standard include paths]),
-  kde_use_extra_includes="$withval",
-  kde_use_extra_includes=NONE
-)
-kde_extra_includes=
-if test -n "$kde_use_extra_includes" && \
-   test "$kde_use_extra_includes" != "NONE"; then
-
-   ac_save_ifs=$IFS
-   IFS=':'
-   for dir in $kde_use_extra_includes; do
-     kde_extra_includes="$kde_extra_includes $dir"
-     USER_INCLUDES="$USER_INCLUDES -I$dir"
-   done
-   IFS=$ac_save_ifs
-   kde_use_extra_includes="added"
-else
-   kde_use_extra_includes="no"
-fi
-AC_SUBST(USER_INCLUDES)
-
-AC_MSG_RESULT($kde_use_extra_includes)
-
-kde_extra_libs=
-AC_MSG_CHECKING(for extra libs)
-AC_ARG_WITH(extra-libs,AC_HELP_STRING([--with-extra-libs=DIR],[adds non standard library paths]),
-  kde_use_extra_libs=$withval,
-  kde_use_extra_libs=NONE
-)
-if test -n "$kde_use_extra_libs" && \
-   test "$kde_use_extra_libs" != "NONE"; then
-
-   ac_save_ifs=$IFS
-   IFS=':'
-   for dir in $kde_use_extra_libs; do
-     kde_extra_libs="$kde_extra_libs $dir"
-     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
-     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
-   done
-   IFS=$ac_save_ifs
-   kde_use_extra_libs="added"
-else
-   kde_use_extra_libs="no"
-fi
-
-AC_SUBST(USER_LDFLAGS)
-
-AC_MSG_RESULT($kde_use_extra_libs)
-
-])
-
-AC_DEFUN([KDE_1_CHECK_PATH_HEADERS],
-[
-    AC_MSG_CHECKING([for KDE headers installed])
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include "confdefs.h"
-#include <kapp.h>
-
-int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-    printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-    printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-    printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-    printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-    printf("kde_styledir=\\"/tmp/dummy\\"\n");
-    printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-    printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-    printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-    printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-    printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-    return 0;
-    }
-EOF
-
- ac_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$all_includes $CPPFLAGS"
- if AC_TRY_EVAL(ac_compile); then
-   AC_MSG_RESULT(yes)
- else
-   AC_MSG_ERROR([your system is not able to compile a small KDE application!
-Check, if you installed the KDE header files correctly.
-For more details about this problem, look at the end of config.log.])
-  fi
-  CPPFLAGS=$ac_save_CPPFLAGS
-
-  AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_CHECK_KDEQTADDON],
-[
-AC_MSG_CHECKING(for kde-qt-addon)
-AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
-[
- kde_ldflags_safe="$LDFLAGS"
- kde_libs_safe="$LIBS"
- kde_cxxflags_safe="$CXXFLAGS"
-
- LIBS="-lkde-qt-addon $LIBQT $LIBS"
- CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes"
- LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
-
- AC_TRY_LINK([
-   #include <qdom.h>
- ],
- [
-   QDomDocument doc;
- ],
-  kde_cv_have_kdeqtaddon=yes,
-  kde_cv_have_kdeqtaddon=no
- )
-
- LDFLAGS=$kde_ldflags_safe
- LIBS=$kde_libs_safe
- CXXFLAGS=$kde_cxxflags_safe
-])
-
-AC_MSG_RESULT($kde_cv_have_kdeqtaddon)
-
-if test "$kde_cv_have_kdeqtaddon" = "no"; then
-  AC_MSG_ERROR([Can't find libkde-qt-addon. You need to install it first.
-It is a separate package (and CVS module) named kde-qt-addon.])
-fi
-])
-
-AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
-[
-   AC_REQUIRE([KDE_MISC_TESTS])
-   AC_REQUIRE([KDE_CHECK_LIBDL])
-   AC_REQUIRE([K_PATH_X])
-
-if test $kde_qtver = 3; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-   AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
-# these are for backward compatibility
-   AC_SUBST(LIB_KSYCOCA, "-lkio")
-   AC_SUBST(LIB_KFILE, "-lkio")
-elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
-   AC_SUBST(LIB_KIO, "-lkio")
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
-   AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-lkfile")
-   AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-lkhtml")
-   AC_SUBST(LIB_KSPELL, "-lkspell")
-   AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
-else
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
-fi
-])
-
-AC_DEFUN([AC_PATH_KDE],
-[
-  AC_BASE_PATH_KDE
-  AC_ARG_ENABLE(path-check,AC_HELP_STRING([--disable-path-check],[don't try to find out, where to install]),
-  [
-  if test "$enableval" = "no";
-    then ac_use_path_checking="default"
-    else ac_use_path_checking=""
-  fi
-  ],
-  [
-  if test "$kde_qtver" = 1;
-    then ac_use_path_checking=""
-    else ac_use_path_checking="default"
-  fi
-  ]
-  )
-
-  AC_CREATE_KFSSTND($ac_use_path_checking)
-
-  AC_SUBST_KFSSTND
-  KDE_CREATE_LIBS_ALIASES
-])
-
-dnl KDE_CHECK_FUNC_EXT(<func>, [headers], [sample-use], [C prototype], [autoheader define], [call if found])
-AC_DEFUN([KDE_CHECK_FUNC_EXT],
-[
-AC_MSG_CHECKING(for $1)
-AC_CACHE_VAL(kde_cv_func_$1,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-save_CXXFLAGS="$CXXFLAGS"
-kde_safe_LIBS="$LIBS"
-LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-AC_TRY_COMPILE([
-$2
-],
-[
-$3
-],
-kde_cv_func_$1=yes,
-kde_cv_func_$1=no)
-CXXFLAGS="$save_CXXFLAGS"
-LIBS="$kde_safe_LIBS"
-AC_LANG_RESTORE
-])
-
-AC_MSG_RESULT($kde_cv_func_$1)
-
-AC_MSG_CHECKING([if $1 needs custom prototype])
-AC_CACHE_VAL(kde_cv_proto_$1,
-[
-if test "x$kde_cv_func_$1" = xyes; then
-  kde_cv_proto_$1=no
-else
-  case "$1" in
-	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_$1="yes - in libkdefakes"
-		;;
-	*)
-		kde_cv_proto_$1=unknown
-		;;
-  esac
-fi
-
-if test "x$kde_cv_proto_$1" = xunknown; then
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-  kde_safe_libs=$LIBS
-  LIBS="$LIBS $X_EXTRA_LIBS"
-  AC_TRY_LINK([
-$2
-
-extern "C" $4;
-],
-[
-$3
-],
-[ kde_cv_func_$1=yes
-  kde_cv_proto_$1=yes ],
-  [kde_cv_proto_$1="$1 unavailable"]
-)
-LIBS=$kde_safe_libs
-AC_LANG_RESTORE
-fi
-])
-AC_MSG_RESULT($kde_cv_proto_$1)
-
-if test "x$kde_cv_func_$1" = xyes; then
-  AC_DEFINE(HAVE_$5, 1, [Define if you have $1])
-  $6
-fi
-if test "x$kde_cv_proto_$1" = xno; then
-  AC_DEFINE(HAVE_$5_PROTO, 1,
-  [Define if you have the $1 prototype])
-fi
-
-AH_VERBATIM([_HAVE_$5_PROTO],
-[
-#if !defined(HAVE_$5_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-$4;
-#ifdef __cplusplus
-}
-#endif
-#endif
-])
-])
-
-AC_DEFUN([AC_CHECK_SETENV],
-[
-	KDE_CHECK_FUNC_EXT(setenv, [
-#include <stdlib.h>
-], 
-		[setenv("VAR", "VALUE", 1);],
-	        [int setenv (const char *, const char *, int)],
-		[SETENV])
-])
-
-AC_DEFUN([AC_CHECK_UNSETENV],
-[
-	KDE_CHECK_FUNC_EXT(unsetenv, [
-#include <stdlib.h>
-], 
-		[unsetenv("VAR");],
-	        [void unsetenv (const char *)],
-		[UNSETENV])
-])
-
-AC_DEFUN([AC_CHECK_GETDOMAINNAME],
-[
-	KDE_CHECK_FUNC_EXT(getdomainname, [
-#include <stdlib.h>
-#include <unistd.h>
-#include <netdb.h>
-], 
-		[
-char buffer[200];
-getdomainname(buffer, 200);
-], 	
-	        [#include <sys/types.h>
-		int getdomainname (char *, size_t)],
-		[GETDOMAINNAME])
-])
-
-AC_DEFUN([AC_CHECK_GETHOSTNAME],
-[
-	KDE_CHECK_FUNC_EXT(gethostname, [
-#include <stdlib.h>
-#include <unistd.h>
-], 
-		[
-char buffer[200];
-gethostname(buffer, 200);
-], 	
-	        [int gethostname (char *, unsigned int)],
-		[GETHOSTNAME])
-])
-
-AC_DEFUN([AC_CHECK_USLEEP],
-[
-	KDE_CHECK_FUNC_EXT(usleep, [
-#include <unistd.h>
-], 
-		[
-usleep(200);
-], 	
-	        [int usleep (unsigned int)],
-		[USLEEP])
-])
-
-
-AC_DEFUN([AC_CHECK_RANDOM],
-[
-	KDE_CHECK_FUNC_EXT(random, [
-#include <stdlib.h>
-], 
-		[
-random();
-], 	
-	        [long int random(void)],
-		[RANDOM])
-
-	KDE_CHECK_FUNC_EXT(srandom, [
-#include <stdlib.h>
-], 
-		[
-srandom(27);
-], 	
-	        [void srandom(unsigned int)],
-		[SRANDOM])
-
-])
-
-AC_DEFUN([AC_CHECK_INITGROUPS],
-[
-	KDE_CHECK_FUNC_EXT(initgroups, [
-#include <sys/types.h>
-#include <unistd.h>
-#include <grp.h>
-],
-	[
-char buffer[200];
-initgroups(buffer, 27);
-],
-	[int initgroups(const char *, gid_t)],
-	[INITGROUPS])
-])
-
-AC_DEFUN([AC_CHECK_MKSTEMPS],
-[
-	KDE_CHECK_FUNC_EXT(mkstemps, [
-#include <stdlib.h>
-#include <unistd.h>
-],
-	[
-mkstemps("/tmp/aaaXXXXXX", 6);
-],
-	[int mkstemps(char *, int)],
-	[MKSTEMPS])
-])
-
-AC_DEFUN([AC_CHECK_MKDTEMP],
-[
-	KDE_CHECK_FUNC_EXT(mkdtemp, [
-#include <stdlib.h>
-#include <unistd.h>
-],
-	[
-mkdtemp("/tmp/aaaXXXXXX");
-],
-	[char *mkdtemp(char *)],
-	[MKDTEMP])
-])
-
-
-AC_DEFUN([AC_CHECK_RES_INIT],
-[
-  AC_MSG_CHECKING([if res_init needs -lresolv])
-  kde_libs_safe="$LIBS"
-  LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-  AC_TRY_LINK(
-    [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-    ],
-    [
-      res_init(); 
-    ],
-    [
-      LIBRESOLV="-lresolv"
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-    ],
-    [ AC_MSG_RESULT(no) ]
-  )
-  LIBS=$kde_libs_safe
-  AC_SUBST(LIBRESOLV)
-
-  AC_MSG_CHECKING([if res_init is available])
-  AC_TRY_COMPILE(
-    [
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-    ],
-    [
-      res_init();
-    ],
-    [
-      AC_MSG_RESULT(yes)
-      AC_DEFINE(HAVE_RES_INIT, 1, [Define if you have the res_init function])
-    ],
-    [ AC_MSG_RESULT(no) ]
-  )
-])
-
-AC_DEFUN([AC_CHECK_STRLCPY],
-[
-	KDE_CHECK_FUNC_EXT(strlcpy, [
-#include <string.h>
-],
-[ char buf[20];
-  strlcpy(buf, "KDE function test", sizeof(buf));
-],
- 	[unsigned long strlcpy(char*, const char*, unsigned long)],
-	[STRLCPY])
-])
-
-AC_DEFUN([AC_CHECK_STRLCAT],
-[
-	KDE_CHECK_FUNC_EXT(strlcat, [
-#include <string.h>
-],
-[ char buf[20];
-  buf[0]='\0';
-  strlcat(buf, "KDE function test", sizeof(buf));
-],
- 	[unsigned long strlcat(char*, const char*, unsigned long)],
-	[STRLCAT])
-])
-
-AC_DEFUN([AC_FIND_GIF],
-   [AC_MSG_CHECKING([for giflib])
-AC_CACHE_VAL(ac_cv_lib_gif,
-[ac_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$all_libraries -lgif -lX11 $LIBSOCKET"
-else
-LIBS="$all_libraries -lgif"
-fi
-AC_TRY_LINK(dnl
-[
-#ifdef __cplusplus
-extern "C" {
-#endif
-int GifLastError(void);
-#ifdef __cplusplus
-}
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-],
-            [return GifLastError();],
-            eval "ac_cv_lib_gif=yes",
-            eval "ac_cv_lib_gif=no")
-LIBS="$ac_save_LIBS"
-])dnl
-if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
-else
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
-fi
-])
-
-AC_DEFUN([KDE_FIND_JPEG_HELPER],
-[
-AC_MSG_CHECKING([for libjpeg$2])
-AC_CACHE_VAL(ac_cv_lib_jpeg_$1,
-[
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -ljpeg$2 -lm"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(
-[/* Override any gcc2 internal prototype to avoid an error.  */
-struct jpeg_decompress_struct;
-typedef struct jpeg_decompress_struct * j_decompress_ptr;
-typedef int size_t;
-#ifdef __cplusplus
-extern "C" {
-#endif
-    void jpeg_CreateDecompress(j_decompress_ptr cinfo,
-                                    int version, size_t structsize);
-#ifdef __cplusplus
-}
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-],
-            [jpeg_CreateDecompress(0L, 0, 0);],
-            eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
-            eval "ac_cv_lib_jpeg_$1=no")
-LIBS="$ac_save_LIBS"
-CFLAGS="$ac_save_CFLAGS"
-])
-
-if eval "test ! \"`echo $ac_cv_lib_jpeg_$1`\" = no"; then
-  LIBJPEG="$ac_cv_lib_jpeg_$1"
-  AC_MSG_RESULT($ac_cv_lib_jpeg_$1)
-else
-  AC_MSG_RESULT(no)
-  $3
-fi
-
-])
-
-AC_DEFUN([AC_FIND_JPEG],
-[
-dnl first look for libraries
-KDE_FIND_JPEG_HELPER(6b, 6b,
-   KDE_FIND_JPEG_HELPER(normal, [],
-    [
-       LIBJPEG=
-    ]
-   )
-)
-
-dnl then search the headers (can't use simply AC_TRY_xxx, as jpeglib.h
-dnl requires system dependent includes loaded before it)
-jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
-test "x$jpeg_incdir" = xNO && jpeg_incdir=
-
-dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
-dnl if only one is missing, it means a configuration error, but we still
-dnl only warn
-if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-  AC_DEFINE_UNQUOTED(HAVE_LIBJPEG, 1, [Define if you have libjpeg])
-else
-  if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-    AC_MSG_WARN([
-There is an installation error in jpeg support. You seem to have only one
-of either the headers _or_ the libraries installed. You may need to either
-provide correct --with-extra-... options, or the development package of
-libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-Disabling JPEG support.
-])
-  else
-    AC_MSG_WARN([libjpeg not found. disable JPEG support.])
-  fi
-  jpeg_incdir=
-  LIBJPEG=
-fi
-
-AC_SUBST(LIBJPEG)
-AH_VERBATIM(_AC_CHECK_JPEG,
-[/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-])
-])
-
-AC_DEFUN([KDE_CHECK_QT_JPEG],
-[
-if test -n "$LIBJPEG"; then
-AC_MSG_CHECKING([if Qt needs $LIBJPEG])
-AC_CACHE_VAL(kde_cv_qt_jpeg,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
-LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(
-[#include <qapplication.h>],
-            [
-            int argc;
-            char** argv;
-            QApplication app(argc, argv);],
-            eval "kde_cv_qt_jpeg=no",
-            eval "kde_cv_qt_jpeg=yes")
-LIBS="$ac_save_LIBS"
-CXXFLAGS="$ac_save_CXXFLAGS"
-AC_LANG_RESTORE
-fi
-])
-
-if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
-  AC_MSG_RESULT(yes)
-  LIBJPEG_QT='$(LIBJPEG)'
-else
-  AC_MSG_RESULT(no)
-  LIBJPEG_QT=
-fi
-
-])
-
-AC_DEFUN([AC_FIND_ZLIB],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for libz])
-AC_CACHE_VAL(ac_cv_lib_z,
-[
-kde_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(dnl
-[
-#include<zlib.h>
-],
-[
-  char buf[42];
-  gzFile f = (gzFile) 0;
-  /* this would segfault.. but we only link, don't run */
-  (void) gzgets(f, buf, sizeof(buf));
-
-  return (zlibVersion() == ZLIB_VERSION); 
-],
-            eval "ac_cv_lib_z='-lz'",
-            eval "ac_cv_lib_z=no")
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if test ! "$ac_cv_lib_z" = no; then
-  AC_DEFINE_UNQUOTED(HAVE_LIBZ, 1, [Define if you have libz])
-  LIBZ="$ac_cv_lib_z"
-  AC_MSG_RESULT($ac_cv_lib_z)
-else
-  AC_MSG_ERROR(not found. 
-          Possibly configure picks up an outdated version
-          installed by XFree86. Remove it from your system.
-
-          Check your installation and look into config.log)
-  LIBZ=""
-fi
-AC_SUBST(LIBZ)
-])
-
-AC_DEFUN([KDE_TRY_TIFFLIB],
-[
-AC_MSG_CHECKING([for libtiff $1])
-
-AC_CACHE_VAL(kde_cv_libtiff_$1,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lX11 $LIBSOCKET -lm"
-else
-LIBS="$all_libraries $USER_LDFLAGS -l$1 $LIBJPEG $LIBZ -lm"
-fi
-kde_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
-[
-#include<tiffio.h>
-],
-    [return (TIFFOpen( "", "r") == 0); ],
-[
-    kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
-], [
-    kde_cv_libtiff_$1=no
-])
-
-LIBS="$kde_save_LIBS"
-CXXFLAGS="$kde_save_CXXFLAGS"
-AC_LANG_RESTORE
-])
-
-if test "$kde_cv_libtiff_$1" = "no"; then
-    AC_MSG_RESULT(no)
-    LIBTIFF=""
-    $3
-else
-    LIBTIFF="$kde_cv_libtiff_$1"
-    AC_MSG_RESULT(yes)
-    AC_DEFINE_UNQUOTED(HAVE_LIBTIFF, 1, [Define if you have libtiff])
-    $2
-fi
-
-])
-
-AC_DEFUN([AC_FIND_TIFF],
-[
-AC_REQUIRE([K_PATH_X])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_REQUIRE([AC_FIND_JPEG])
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
-KDE_TRY_TIFFLIB(tiff, [],
-   KDE_TRY_TIFFLIB(tiff34))
-
-AC_SUBST(LIBTIFF)
-])
-
-
-AC_DEFUN([AC_FIND_PNG],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_ZLIB])
-AC_MSG_CHECKING([for libpng])
-AC_CACHE_VAL(ac_cv_lib_png,
-[
-kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-else
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-fi
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
-    [
-    #include<png.h>
-    ],
-    [
-    png_structp png_ptr = png_create_read_struct(  /* image ptr */
-		PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-    return( png_ptr != 0 );
-    ],
-    eval "ac_cv_lib_png='-lpng $LIBZ -lm'",
-    eval "ac_cv_lib_png=no"
-)
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-  AC_DEFINE_UNQUOTED(HAVE_LIBPNG, 1, [Define if you have libpng])
-  LIBPNG="$ac_cv_lib_png"
-  AC_SUBST(LIBPNG)
-  AC_MSG_RESULT($ac_cv_lib_png)
-else
-  AC_MSG_RESULT(no)
-  LIBPNG=""
-  AC_SUBST(LIBPNG)
-fi
-])
-
-
-AC_DEFUN([AC_FIND_JASPER],
-[
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_REQUIRE([AC_FIND_JPEG])
-AC_MSG_CHECKING([for jasper])
-AC_CACHE_VAL(ac_cv_jasper,
-[
-kde_save_LIBS="$LIBS"
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -ljasper $LIBJPEG -lm"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
-AC_TRY_LINK(dnl
-    [
-    #include<jasper/jasper.h>
-    ],
-    [
-    return( jas_init() );
-    ],
-    eval "ac_cv_jasper='-ljasper $LIBJPEG -lm'",
-    eval "ac_cv_jasper=no"
-)
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-])dnl
-if eval "test ! \"`echo $ac_cv_jasper`\" = no"; then
-  AC_DEFINE_UNQUOTED(HAVE_JASPER, 1, [Define if you have jasper])
-  LIB_JASPER="$ac_cv_jasper"
-  AC_MSG_RESULT($ac_cv_jasper)
-else
-  AC_MSG_RESULT(no)
-  LIB_JASPER=""
-fi
-AC_SUBST(LIB_JASPER)
-])
-
-AC_DEFUN([AC_CHECK_BOOL],
-[
-  AC_DEFINE_UNQUOTED(HAVE_BOOL, 1, [You _must_ have bool])
-])
-
-AC_DEFUN([AC_CHECK_GNU_EXTENSIONS],
-[
-AC_MSG_CHECKING(if you need GNU extensions)
-AC_CACHE_VAL(ac_cv_gnu_extensions,
-[
-cat > conftest.c << EOF
-#include <features.h>
-
-#ifdef __GNU_LIBRARY__
-yes
-#endif
-EOF
-
-if (eval "$ac_cpp conftest.c") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_gnu_extensions=yes
-else
-  ac_cv_gnu_extensions=no
-fi
-])
-
-AC_MSG_RESULT($ac_cv_gnu_extensions)
-if test "$ac_cv_gnu_extensions" = "yes"; then
-  AC_DEFINE_UNQUOTED(_GNU_SOURCE, 1, [Define if you need to use the GNU extensions])
-fi
-])
-
-AC_DEFUN([KDE_CHECK_COMPILER_FLAG],
-[
-AC_MSG_CHECKING([whether $CXX supports -$1])
-kde_cache=`echo $1 | sed 'y% .=/+-,%____p__%'`
-AC_CACHE_VAL(kde_cv_prog_cxx_$kde_cache,
-[
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -$1"
-  AC_TRY_LINK([],[ return 0; ], [eval "kde_cv_prog_cxx_$kde_cache=yes"], [])
-  CXXFLAGS="$save_CXXFLAGS"
-  AC_LANG_RESTORE
-])
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- AC_MSG_RESULT(yes)
- :
- $2
-else
- AC_MSG_RESULT(no)
- :
- $3
-fi
-])
-
-dnl AC_REMOVE_FORBIDDEN removes forbidden arguments from variables
-dnl use: AC_REMOVE_FORBIDDEN(CC, [-forbid -bad-option whatever])
-dnl it's all white-space separated
-AC_DEFUN([AC_REMOVE_FORBIDDEN],
-[ __val=$$1
-  __forbid=" $2 "
-  if test -n "$__val"; then
-    __new=""
-    ac_save_IFS=$IFS
-    IFS=" 	"
-    for i in $__val; do
-      case "$__forbid" in
-        *" $i "*) AC_MSG_WARN([found forbidden $i in $1, removing it]) ;;
-	*) # Careful to not add spaces, where there were none, because otherwise
-	   # libtool gets confused, if we change e.g. CXX
-	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-      esac
-    done
-    IFS=$ac_save_IFS
-    $1=$__new
-  fi
-])
-
-dnl AC_VALIDIFY_CXXFLAGS checks for forbidden flags the user may have given
-AC_DEFUN([AC_VALIDIFY_CXXFLAGS],
-[dnl
-if test "x$kde_use_qt_emb" != "xyes"; then
- AC_REMOVE_FORBIDDEN(CXX, [-fno-rtti -rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-fno-rtti -rpath])
-else
- AC_REMOVE_FORBIDDEN(CXX, [-rpath])
- AC_REMOVE_FORBIDDEN(CXXFLAGS, [-rpath])
-fi
-])
-
-AC_DEFUN([AC_CHECK_COMPILERS],
-[
-  AC_ARG_ENABLE(debug,
-	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
-  [
-    case $enableval in
-      yes)
-        kde_use_debug_code="yes"
-        kde_use_debug_define=no
-        ;;
-      full)
-        kde_use_debug_code="full"
-        kde_use_debug_define=no
-        ;;
-      *)
-        kde_use_debug_code="no"
-        kde_use_debug_define=yes
-        ;;
-    esac
-  ], 
-    [kde_use_debug_code="no"
-      kde_use_debug_define=no
-  ])
-
-  dnl Just for configure --help
-  AC_ARG_ENABLE(dummyoption,
-	        AC_HELP_STRING([--disable-debug],
-	  		       [disables debug output and debug symbols [default=no]]),
-		[],[])
-
-  AC_ARG_ENABLE(strict,
-		AC_HELP_STRING([--enable-strict],
-			      [compiles with strict compiler options (may not work!)]),
-   [
-    if test $enableval = "no"; then
-         kde_use_strict_options="no"
-       else
-         kde_use_strict_options="yes"
-    fi
-   ], [kde_use_strict_options="no"])
-
-  AC_ARG_ENABLE(warnings,AC_HELP_STRING([--disable-warnings],[disables compilation with -Wall and similiar]),
-   [
-    if test $enableval = "no"; then
-         kde_use_warnings="no"
-       else
-         kde_use_warnings="yes"
-    fi
-   ], [kde_use_warnings="yes"])
-
-  dnl enable warnings for debug build
-  if test "$kde_use_debug_code" != "no"; then
-    kde_use_warnings=yes
-  fi
-
-  AC_ARG_ENABLE(profile,AC_HELP_STRING([--enable-profile],[creates profiling infos [default=no]]),
-    [kde_use_profiling=$enableval],
-    [kde_use_profiling="no"]
-  )
-
-  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-  CFLAGS=" $CFLAGS"
-
-  AC_PROG_CC 
-
-  AC_PROG_CPP
-
-  if test "$GCC" = "yes"; then
-    if test "$kde_use_debug_code" != "no"; then
-      if test $kde_use_debug_code = "full"; then
-        CFLAGS="-g3 -fno-inline $CFLAGS"
-      else
-        CFLAGS="-g -O2 $CFLAGS"
-      fi
-    else
-      CFLAGS="-O2 $CFLAGS"
-    fi
-  fi
-
-  if test "$kde_use_debug_define" = "yes"; then
-    CFLAGS="-DNDEBUG $CFLAGS"
-  fi
-
-
-  case "$host" in
-  *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
-  *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
-  esac
-
-  if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then
-     LDFLAGS=""
-  fi
-
-  CXXFLAGS=" $CXXFLAGS"
-
-  AC_PROG_CXX
-
-  if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-    if test "$kde_use_debug_code" != "no"; then
-      if test "$CXX" = "KCC"; then
-        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-      else
-        if test "$kde_use_debug_code" = "full"; then
-          CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
-        else
-          CXXFLAGS="-g -O2 $CXXFLAGS"
-        fi
-      fi
-      KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
-
-      dnl convenience compiler flags
-      KDE_CHECK_COMPILER_FLAG(Woverloaded-virtual, [WOVERLOADED_VIRTUAL="-Woverloaded-virtual"], [WOVERLOADED_VRITUAL=""])
-      AC_SUBST(WOVERLOADED_VIRTUAL)
-    else
-      if test "$CXX" = "KCC"; then
-        CXXFLAGS="+K3 $CXXFLAGS"
-      else
-        CXXFLAGS="-O2 $CXXFLAGS"
-      fi  
-    fi
-  fi
-
-  if test "$kde_use_debug_define" = "yes"; then
-    CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
-  fi  
-
-  if test "$kde_use_profiling" = "yes"; then
-    KDE_CHECK_COMPILER_FLAG(pg,
-    [
-      CFLAGS="-pg $CFLAGS"
-      CXXFLAGS="-pg $CXXFLAGS"
-    ])
-  fi
-
-  if test "$kde_use_warnings" = "yes"; then
-      if test "$GCC" = "yes"; then
-        case $host in
-          *-*-linux-gnu)	
-            CFLAGS="-ansi -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
-            KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"; CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
-          ;;
-        esac
-        CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-        KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
-        KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
-        KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"])
-     fi
-  fi
-
-  if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then
-    CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
-  fi
-    
-  if test "$GXX" = "yes"; then
-    KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
-    KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
-    KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
-    KDE_CHECK_COMPILER_FLAG(fexceptions, [USE_EXCEPTIONS="-fexceptions"], USE_EXCEPTIONS=	)
-  fi
-  if test "$CXX" = "KCC"; then
-    dnl unfortunately we currently cannot disable exception support in KCC
-    dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
-    dnl KDE_CHECK_COMPILER_FLAG(-no_exceptions,[CXXFLAGS="$CXXFLAGS --no_exceptions"])
-    dnl KDE_CHECK_COMPILER_FLAG(-exceptions, [USE_EXCEPTIONS="--exceptions"], USE_EXCEPTIONS=	)
-
-    AC_ARG_ENABLE(pch,
-	AC_HELP_STRING([--enable-pch],
-		       [enables precompiled header support (currently only KCC) [default=no]]),
-    [
-      kde_use_pch=$enableval
-    ],[kde_use_pch=no])
- 
-    if test "$kde_use_pch" = "yes"; then
-      dnl TODO: support --pch-dir!
-      KDE_CHECK_COMPILER_FLAG(-pch,[CXXFLAGS="$CXXFLAGS --pch"])
-      dnl the below works (but the dir must exist), but it's
-      dnl useless for a whole package.
-      dnl The are precompiled headers for each source file, so when compiling
-      dnl from scratch, it doesn't make a difference, and they take up
-      dnl around ~5Mb _per_ sourcefile.
-      dnl KDE_CHECK_COMPILER_FLAG(-pch_dir /tmp,
-      dnl   [CXXFLAGS="$CXXFLAGS --pch_dir `pwd`/pcheaders"])
-    fi
-    dnl this flag controls inlining. by default KCC inlines in optimisation mode
-    dnl all implementations that are defined inside the class {} declaration. 
-    dnl because of templates-compatibility with broken gcc compilers, this
-    dnl can cause excessive inlining. This flag limits it to a sane level
-    KDE_CHECK_COMPILER_FLAG(-inline_keyword_space_time=6,[CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"])
-    KDE_CHECK_COMPILER_FLAG(-inline_auto_space_time=2,[CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"])
-    KDE_CHECK_COMPILER_FLAG(-inline_implicit_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"])
-    KDE_CHECK_COMPILER_FLAG(-inline_generated_space_time=2.0,[CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"])
-    dnl Some source files are shared between multiple executables
-    dnl (or libraries) and some of those need template instantiations.
-    dnl In that case KCC needs to compile those sources with
-    dnl --one_instantiation_per_object.  To make it easy for us we compile
-    dnl _all_ objects with that flag (--one_per is a shorthand).
-    KDE_CHECK_COMPILER_FLAG(-one_per, [CXXFLAGS="$CXXFLAGS --one_per"])
-  fi
-  AC_SUBST(USE_EXCEPTIONS)
-  dnl obsolete macro - provided to keep things going
-  USE_RTTI=
-  AC_SUBST(USE_RTTI)
-
-  case "$host" in
-      *-*-irix*)  test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;;
-      *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";;
-      *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";;
-      *-*-solaris*) 
-        if test "$GXX" = yes; then
-          libstdcpp=`$CXX -print-file-name=libstdc++.so`
-          if test ! -f $libstdcpp; then
-             AC_MSG_ERROR([You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so])
-          fi
-        fi
-        ;;
-  esac
-
-  AC_VALIDIFY_CXXFLAGS
-
-  AC_PROG_CXXCPP
-
-  if test "$GCC" = yes; then
-     NOOPT_CFLAGS=-O0
-  fi
-  KDE_CHECK_COMPILER_FLAG(O0,[NOOPT_CXXFLAGS=-O0])
-
-  AC_SUBST(NOOPT_CXXFLAGS)
-  AC_SUBST(NOOPT_CFLAGS)
-
-  KDE_CHECK_FINAL
-  KDE_CHECK_CLOSURE
-  KDE_CHECK_NMCHECK
-
-  ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
-])
-
-AC_DEFUN([KDE_ADD_DEPENDENCIES],
-[
-   [A]M_DEPENDENCIES(CC)
-   [A]M_DEPENDENCIES(CXX)
-])
-
-dnl just a wrapper to clean up configure.in
-AC_DEFUN([KDE_PROG_LIBTOOL],
-[
-AC_REQUIRE([AC_CHECK_COMPILERS])
-AC_REQUIRE([AC_ENABLE_SHARED])
-AC_REQUIRE([AC_ENABLE_STATIC])
-
-AC_REQUIRE([AC_LIBTOOL_DLOPEN])
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-AC_OBJEXT
-AC_EXEEXT
-
-AM_PROG_LIBTOOL
-AC_LIBTOOL_CXX
-
-LIBTOOL_SHELL="/bin/sh ./libtool"
-#  LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
-AC_SUBST(KDE_PLUGIN)
-
-# we patch configure quite some so we better keep that consistent for incremental runs 
-AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure')
-])
-
-AC_DEFUN([KDE_CHECK_LIB64],
-[
-    kdelibsuff=no
-    AC_ARG_ENABLE(libsuffix,
-        AC_HELP_STRING([--enable-libsuffix],
-            [/lib directory suffix (64,32,none[=default])]),
-            kdelibsuff=$enableval)
-    # TODO: add an auto case that compiles a little C app to check
-    # where the glibc is
-    if test "$kdelibsuff" = "no"; then
-       kdelibsuff=
-    fi
-    if test -z "$kdelibsuff"; then
-        AC_MSG_RESULT([not using lib directory suffix])
-        AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
-    else
-        if test "$libdir" = '${exec_prefix}/lib'; then
-            libdir="$libdir${kdelibsuff}"
-            AC_SUBST([libdir], ["$libdir"])  dnl ugly hack for lib64 platforms
-        fi
-        AC_DEFINE_UNQUOTED(KDELIBSUFF, ["\"${kdelibsuff}\""], Suffix for lib directories)
-        AC_MSG_RESULT([using lib directory suffix $kdelibsuff])
-    fi
-])
-
-AC_DEFUN([KDE_CHECK_TYPES],
-[  AC_CHECK_SIZEOF(int, 4)dnl
-   AC_CHECK_SIZEOF(short)dnl
-  AC_CHECK_SIZEOF(long, 4)dnl
-  AC_CHECK_SIZEOF(char *, 4)dnl
-])dnl
-
-AC_DEFUN([KDE_DO_IT_ALL],
-[
-AC_CANONICAL_SYSTEM
-AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE($1, $2)
-AM_DISABLE_LIBRARIES
-AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
-AC_CHECK_COMPILERS
-KDE_PROG_LIBTOOL
-AM_KDE_WITH_NLS
-AC_PATH_KDE
-])
-
-AC_DEFUN([AC_CHECK_RPATH],
-[
-AC_MSG_CHECKING(for rpath)
-AC_ARG_ENABLE(rpath,
-      AC_HELP_STRING([--disable-rpath],[do not use the rpath feature of ld]),
-      USE_RPATH=$enableval, USE_RPATH=yes)
-
-if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-
-  KDE_RPATH="-R \$(kde_libraries)"
-
-  if test -n "$qt_libraries"; then
-    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-  fi
-  dnl $x_libraries is set to /usr/lib in case
-  if test -n "$X_LDFLAGS"; then
-    X_RPATH="-R \$(x_libraries)"
-    KDE_RPATH="$KDE_RPATH $X_RPATH"
-  fi
-  if test -n "$KDE_EXTRA_RPATH"; then
-    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
-  fi
-fi
-AC_SUBST(KDE_EXTRA_RPATH)
-AC_SUBST(KDE_RPATH)
-AC_SUBST(X_RPATH)
-AC_MSG_RESULT($USE_RPATH)
-])
-
-dnl Check for the type of the third argument of getsockname
-AC_DEFUN([AC_CHECK_SOCKLEN_T], [
-  AC_MSG_CHECKING(for socklen_t)
-  AC_CACHE_VAL(ac_cv_socklen_t, [
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-      ],[
-socklen_t a=0;
-getsockname(0,(struct sockaddr*)0, &a);
-      ],
-      ac_cv_socklen_t=socklen_t,
-      AC_TRY_COMPILE([
-#include <sys/types.h>
-#include <sys/socket.h>
-        ],[
-int a=0;
-getsockname(0,(struct sockaddr*)0, &a);
-        ],
-        ac_cv_socklen_t=int,
-        ac_cv_socklen_t=size_t
-      )
-    )
-    AC_LANG_RESTORE
-  ])
-
-  AC_MSG_RESULT($ac_cv_socklen_t)
-  if test "$ac_cv_socklen_t" != "socklen_t"; then
-    AC_DEFINE_UNQUOTED(socklen_t, $ac_cv_socklen_t,
-        [Define the real type of socklen_t])
-  fi
-  AC_DEFINE_UNQUOTED(ksize_t, socklen_t, [Compatibility define])
-
-])
-
-dnl This is a merge of some macros out of the gettext aclocal.m4
-dnl since we don't need anything, I took the things we need
-dnl the copyright for them is:
-dnl >
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-dnl This Makefile.in 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 >
-dnl for this file it is relicensed under LGPL
-
-AC_DEFUN([AM_KDE_WITH_NLS],
-  [
-    dnl If we use NLS figure out what method
-
-    AM_PATH_PROG_WITH_TEST_KDE(MSGFMT, msgfmt,
-        [test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"], msgfmt)
-    AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-     if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
-        AC_MSG_RESULT([found msgfmt program is not GNU msgfmt; ignore it])
-        GMSGFMT=":"
-      fi
-      MSGFMT=$GMSGFMT
-      AC_SUBST(GMSGFMT)
-      AC_SUBST(MSGFMT)
-
-      AM_PATH_PROG_WITH_TEST_KDE(XGETTEXT, xgettext,
-	[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-
-      dnl Test whether we really found GNU xgettext.
-      if test "$XGETTEXT" != ":"; then
-	dnl If it is no GNU xgettext we define it as : so that the
-	dnl Makefiles still can work.
-	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  AC_MSG_RESULT(
-	    [found xgettext programs is not GNU xgettext; ignore it])
-	  XGETTEXT=":"
-	fi
-      fi
-     AC_SUBST(XGETTEXT)
-
-  ])
-
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-# serial 1
-# Stephan Kulow: I appended a _KDE against name conflicts
-
-dnl AM_PATH_PROG_WITH_TEST_KDE(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST_KDE],
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# serial 1
-
-AC_DEFUN([AM_LC_MESSAGES],
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1, [Define if your locale.h file contains LC_MESSAGES])
-    fi
-  fi])
-
-dnl From Jim Meyering.
-dnl FIXME: migrate into libit.
-
-AC_DEFUN([AM_FUNC_OBSTACK],
-[AC_CACHE_CHECK([for obstacks], am_cv_func_obstack,
- [AC_TRY_LINK([#include "obstack.h"],
-	      [struct obstack *mem;obstack_free(mem,(char *) 0)],
-	      am_cv_func_obstack=yes,
-	      am_cv_func_obstack=no)])
- if test $am_cv_func_obstack = yes; then
-   AC_DEFINE(HAVE_OBSTACK)
- else
-   LIBOBJS="$LIBOBJS obstack.o"
- fi
-])
-
-dnl From Jim Meyering.  Use this if you use the GNU error.[ch].
-dnl FIXME: Migrate into libit
-
-AC_DEFUN([AM_FUNC_ERROR_AT_LINE],
-[AC_CACHE_CHECK([for error_at_line], am_cv_lib_error_at_line,
- [AC_TRY_LINK([],[error_at_line(0, 0, "", 0, "");],
-              am_cv_lib_error_at_line=yes,
-	      am_cv_lib_error_at_line=no)])
- if test $am_cv_lib_error_at_line = no; then
-   LIBOBJS="$LIBOBJS error.o"
- fi
- AC_SUBST(LIBOBJS)dnl
-])
-
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-
-# serial 1
-# Stephan Kulow: I put a KDE in it to avoid name conflicts
-
-AC_DEFUN([AM_KDE_GNU_GETTEXT],
-  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-   AC_REQUIRE([AC_FUNC_MMAP])dnl
-   AC_REQUIRE([AM_KDE_WITH_NLS])dnl
-   AC_CHECK_HEADERS([limits.h locale.h nl_types.h string.h values.h alloca.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
-
-   AC_MSG_CHECKING(for stpcpy)
-   AC_CACHE_VAL(kde_cv_func_stpcpy,
-   [
-   kde_safe_cxxflags=$CXXFLAGS
-   CXXFLAGS="-Werror"
-   AC_LANG_SAVE
-   AC_LANG_CPLUSPLUS
-   AC_TRY_COMPILE([
-   #include <string.h>
-   ],
-   [
-   char buffer[200];
-   stpcpy(buffer, buffer);
-   ],
-   kde_cv_func_stpcpy=yes,
-   kde_cv_func_stpcpy=no)
-   AC_LANG_RESTORE
-   CXXFLAGS=$kde_safe_cxxflags
-   ])
-   AC_MSG_RESULT($kde_cv_func_stpcpy)
-   if eval "test \"`echo $kde_cv_func_stpcpy`\" = yes"; then
-     AC_DEFINE(HAVE_STPCPY, 1, [Define if you have stpcpy])
-   fi
-
-   AM_LC_MESSAGES
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-  ])
-
-AC_DEFUN([AC_HAVE_XPM],
- [AC_REQUIRE_CPP()dnl
-  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$XPM_LDFLAGS" && XPM_LDFLAGS=
- test -z "$XPM_INCLUDE" && XPM_INCLUDE=
-
- AC_ARG_WITH(xpm,AC_HELP_STRING([--without-xpm],[disable color pixmap XPM tests]),
-	xpm_test=$withval, xpm_test="yes")
- if test "x$xpm_test" = xno; then
-   ac_cv_have_xpm=no
- else
-   AC_MSG_CHECKING(for XPM)
-   AC_CACHE_VAL(ac_cv_have_xpm,
-   [
-    ac_save_ldflags="$LDFLAGS"
-    ac_save_cflags="$CFLAGS"
-    if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm -lX11 -lXext $LIBZ $LIBSOCKET"
-    else
-      LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS $LDFLAGS $XPM_LDFLAGS $all_libraries -lXpm $LIBZ $LIBSOCKET"
-    fi
-    CFLAGS="$CFLAGS $X_INCLUDES $USER_INCLUDES"
-    test -n "$XPM_INCLUDE" && CFLAGS="-I$XPM_INCLUDE $CFLAGS"
-    AC_TRY_LINK([#include <X11/xpm.h>],[],
-	ac_cv_have_xpm="yes",ac_cv_have_xpm="no")
-    LDFLAGS="$ac_save_ldflags"
-    CFLAGS="$ac_save_cflags"
-   ])dnl
-
-  if test "$ac_cv_have_xpm" = no; then
-    AC_MSG_RESULT(no)
-    XPM_LDFLAGS=""
-    XPMINC=""
-    $2
-  else
-    AC_DEFINE(HAVE_XPM, 1, [Define if you have XPM support])
-    if test "$XPM_LDFLAGS" = ""; then
-       XPMLIB='-lXpm $(LIB_X11)'
-    else
-       XPMLIB="-L$XPM_LDFLAGS -lXpm "'$(LIB_X11)'
-    fi
-    if test "$XPM_INCLUDE" = ""; then
-       XPMINC=""
-    else
-       XPMINC="-I$XPM_INCLUDE"
-    fi
-    AC_MSG_RESULT(yes)
-    $1
-  fi
- fi
- AC_SUBST(XPMINC)
- AC_SUBST(XPMLIB)
-])
-
-AC_DEFUN([AC_HAVE_DPMS],
- [AC_REQUIRE_CPP()dnl
-  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$DPMS_LDFLAGS" && DPMS_LDFLAGS=
- test -z "$DPMS_INCLUDE" && DPMS_INCLUDE=
- DPMS_LIB=
-
- AC_ARG_WITH(dpms,AC_HELP_STRING([--without-dpms],[disable DPMS power saving]),
-	dpms_test=$withval, dpms_test="yes")
- if test "x$dpms_test" = xno; then
-   ac_cv_have_dpms=no
- else
-   AC_MSG_CHECKING(for DPMS)
-   dnl Note: ac_cv_have_dpms can be no, yes, or -lXdpms.
-   dnl 'yes' means DPMS_LIB="", '-lXdpms' means DPMS_LIB="-lXdpms".
-   AC_CACHE_VAL(ac_cv_have_dpms,
-   [
-    if test "x$kde_use_qt_emb" = "xyes" || test "x$kde_use_qt_mac" = "xyes"; then
-      AC_MSG_RESULT(no)
-      ac_cv_have_dpms="no"
-    else
-      ac_save_ldflags="$LDFLAGS"
-      ac_save_cflags="$CFLAGS"
-      ac_save_libs="$LIBS"
-      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
-      CFLAGS="$CFLAGS $X_INCLUDES"
-      test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-      AC_TRY_LINK([
-	  #include <X11/Xproto.h>
-	  #include <X11/X.h>
-	  #include <X11/Xlib.h>
-	  #include <X11/extensions/dpms.h>
-	  int foo_test_dpms()
-	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
-	  ac_cv_have_dpms="yes", [
-              LDFLAGS="$ac_save_ldflags"
-              CFLAGS="$ac_save_cflags"
-              LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
-              LIBS="$LIBS -lXdpms"
-              CFLAGS="$CFLAGS $X_INCLUDES"
-              test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
-              AC_TRY_LINK([
-	          #include <X11/Xproto.h>
-        	  #include <X11/X.h>
-        	  #include <X11/Xlib.h>
-        	  #include <X11/extensions/dpms.h>
-        	  int foo_test_dpms()
-        	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
-        	  [
-                  ac_cv_have_dpms="-lXdpms"
-                  ],ac_cv_have_dpms="no")
-              ])
-      LDFLAGS="$ac_save_ldflags"
-      CFLAGS="$ac_save_cflags"
-      LIBS="$ac_save_libs"
-    fi
-   ])dnl
-
-  if test "$ac_cv_have_dpms" = no; then
-    AC_MSG_RESULT(no)
-    DPMS_LDFLAGS=""
-    DPMSINC=""
-    $2
-  else
-    AC_DEFINE(HAVE_DPMS, 1, [Define if you have DPMS support])
-    if test "$ac_cv_have_dpms" = "-lXdpms"; then
-       DPMS_LIB="-lXdpms"
-    fi
-    if test "$DPMS_LDFLAGS" = ""; then
-       DPMSLIB="$DPMS_LIB "'$(LIB_X11)'
-    else
-       DPMSLIB="$DPMS_LDFLAGS $DPMS_LIB "'$(LIB_X11)'
-    fi
-    if test "$DPMS_INCLUDE" = ""; then
-       DPMSINC=""
-    else
-       DPMSINC="-I$DPMS_INCLUDE"
-    fi
-    AC_MSG_RESULT(yes)
-    $1
-  fi
- fi
- ac_save_cflags="$CFLAGS"
- CFLAGS="$CFLAGS $X_INCLUDES"
- test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
- AH_TEMPLATE(HAVE_DPMSCAPABLE_PROTO,
-   [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
- AC_CHECK_DECL(DPMSCapable,
-   AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
-   [#include <X11/extensions/dpms.h>])
- AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
-   [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
- AC_CHECK_DECL(DPMSInfo,
-   AC_DEFINE(HAVE_DPMSINFO_PROTO),,
-   [#include <X11/extensions/dpms.h>])
- CFLAGS="$ac_save_cflags"
- AC_SUBST(DPMSINC)
- AC_SUBST(DPMSLIB)
-])
-
-AC_DEFUN([AC_HAVE_GL],
- [AC_REQUIRE_CPP()dnl
-  AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-
- test -z "$GL_LDFLAGS" && GL_LDFLAGS=
- test -z "$GL_INCLUDE" && GL_INCLUDE=
-
- AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
-	gl_test=$withval, gl_test="yes")
- if test "x$kde_use_qt_emb" = "xyes"; then
-   # GL and Qt Embedded is a no-go for now.
-   ac_cv_have_gl=no
- elif test "x$gl_test" = xno; then
-   ac_cv_have_gl=no
- else
-   AC_MSG_CHECKING(for GL)
-   AC_CACHE_VAL(ac_cv_have_gl,
-   [
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_save_ldflags="$LDFLAGS"
-    ac_save_cxxflags="$CXXFLAGS"
-    LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries -lMesaGL -lMesaGLU"
-    test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11"
-    LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET"
-    CXXFLAGS="$CFLAGS $X_INCLUDES"
-    test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-    AC_TRY_LINK([#include <GL/gl.h>
-#include <GL/glu.h>
-], [],
-	ac_cv_have_gl="mesa", ac_cv_have_gl="no")
-    if test "x$ac_cv_have_gl" = "xno"; then
-      LDFLAGS="$ac_save_ldflags $X_LDFLAGS $GL_LDFLAGS $all_libraries -lGLU -lGL"
-      test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LDFLAGS="$LDFLAGS -lX11"
-      LDFLAGS="$LDFLAGS $LIB_XEXT -lm $LIBSOCKET"
-      CXXFLAGS="$ac_save_cflags $X_INCLUDES"
-      test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-      AC_TRY_LINK([#include <GL/gl.h>
-#include <GL/glu.h>
-], [],
-	  ac_cv_have_gl="yes", ac_cv_have_gl="no")
-    fi
-    AC_LANG_RESTORE
-    LDFLAGS="$ac_save_ldflags"
-    CXXFLAGS="$ac_save_cxxflags"
-   ])dnl
-
-  if test "$ac_cv_have_gl" = "no"; then
-    AC_MSG_RESULT(no)
-    GL_LDFLAGS=""
-    GLINC=""
-    $2
-  else
-    AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
-    if test "$GL_LDFLAGS" = ""; then
-       if test "$ac_cv_have_gl" = "mesa"; then
-          GLLIB='-lMesaGLU -lMesaGL $(LIB_X11)'
-       else
-          GLLIB='-lGLU -lGL $(LIB_X11)'
-       fi
-    else
-       if test "$ac_cv_have_gl" = "mesa"; then
-          GLLIB="$GL_LDFLAGS -lMesaGLU -lMesaGL "'$(LIB_X11)'
-       else
-          GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
-       fi
-    fi
-    if test "$GL_INCLUDE" = ""; then
-       GLINC=""
-    else
-       GLINC="-I$GL_INCLUDE"
-    fi
-    AC_MSG_RESULT($ac_cv_have_gl)
-    $1
-  fi
- fi
- AC_SUBST(GLINC)
- AC_SUBST(GLLIB)
-])
-
-
- dnl shadow password and PAM magic - maintained by ossi@kde.org
-
-AC_DEFUN([KDE_PAM], [
-  AC_REQUIRE([KDE_CHECK_LIBDL])
-
-  want_pam=
-  AC_ARG_WITH(pam,
-    AC_HELP_STRING([--with-pam[=ARG]],[enable support for PAM: ARG=[yes|no|service name]]),
-    [ if test "x$withval" = "xyes"; then
-        want_pam=yes
-        pam_service=kde
-      elif test "x$withval" = "xno"; then
-        want_pam=no
-      else
-        want_pam=yes
-        pam_service=$withval
-      fi
-    ], [ pam_service=kde ])
-
-  use_pam=
-  PAMLIBS=
-  if test "x$want_pam" != xno; then
-    AC_CHECK_LIB(pam, pam_start, [
-      AC_CHECK_HEADER(security/pam_appl.h,
-        [ pam_header=security/pam_appl.h ],
-        [ AC_CHECK_HEADER(pam/pam_appl.h,
-            [ pam_header=pam/pam_appl.h ],
-            [
-    AC_MSG_WARN([PAM detected, but no headers found!
-Make sure you have the necessary development packages installed.])
-            ]
-          )
-        ]
-      )
-    ], , $LIBDL)
-    if test -z "$pam_header"; then
-      if test "x$want_pam" = xyes; then
-        AC_MSG_ERROR([--with-pam was specified, but cannot compile with PAM!])
-      fi
-    else
-      AC_DEFINE(HAVE_PAM, 1, [Defines if you have PAM (Pluggable Authentication Modules)])
-      PAMLIBS="$PAM_MISC_LIB -lpam $LIBDL"
-      use_pam=yes
-
-      dnl darwin claims to be something special
-      if test "$pam_header" = "pam/pam_appl.h"; then
-        AC_DEFINE(HAVE_PAM_PAM_APPL_H, 1, [Define if your PAM headers are in pam/ instead of security/])
-      fi
-
-      dnl test whether struct pam_message is const (Linux) or not (Sun)
-      AC_MSG_CHECKING(for const pam_message)
-      AC_EGREP_HEADER([struct pam_message], $pam_header,
-        [ AC_EGREP_HEADER([const struct pam_message], $pam_header,
-                          [AC_MSG_RESULT([const: Linux-type PAM])],
-                          [AC_MSG_RESULT([nonconst: Sun-type PAM])
-                          AC_DEFINE(PAM_MESSAGE_NONCONST, 1, [Define if your PAM support takes non-const arguments (Solaris)])]
-                          )],
-        [AC_MSG_RESULT([not found - assume const, Linux-type PAM])])
-    fi
-  fi
-
-  AC_SUBST(PAMLIBS)
-])
-
-dnl DEF_PAM_SERVICE(arg name, full name, define name)
-AC_DEFUN([DEF_PAM_SERVICE], [
-  AC_ARG_WITH($1-pam,
-    AC_HELP_STRING([--with-$1-pam=[val]],[override PAM service from --with-pam for $2]),
-    [ if test "x$use_pam" = xyes; then
-        $3_PAM_SERVICE=$withval
-      else
-        AC_MSG_ERROR([Cannot use use --with-$1-pam, as no PAM was detected.
-You may want to enforce it by using --with-pam.])
-      fi
-    ], 
-    [ if test "x$use_pam" = xyes; then
-        $3_PAM_SERVICE="$pam_service"
-      fi
-    ])
-    if test -n "$$3_PAM_SERVICE"; then
-      AC_MSG_RESULT([The PAM service used by $2 will be $$3_PAM_SERVICE])
-      AC_DEFINE_UNQUOTED($3_PAM_SERVICE, "$$3_PAM_SERVICE", [The PAM service to be used by $2])
-    fi
-    AC_SUBST($3_PAM_SERVICE)
-])
-
-AC_DEFUN([KDE_SHADOWPASSWD], [
-  AC_REQUIRE([KDE_PAM])
-
-  AC_CHECK_LIB(shadow, getspent,
-    [ LIBSHADOW="-lshadow"
-      ac_use_shadow=yes
-    ],
-    [ dnl for UnixWare
-      AC_CHECK_LIB(gen, getspent, 
-        [ LIBGEN="-lgen"
-          ac_use_shadow=yes
-        ], 
-        [ AC_CHECK_FUNC(getspent, 
-            [ ac_use_shadow=yes ],
-            [ ac_use_shadow=no ])
-	])
-    ])
-  AC_SUBST(LIBSHADOW)
-  AC_SUBST(LIBGEN)
-  
-  AC_MSG_CHECKING([for shadow passwords])
-
-  AC_ARG_WITH(shadow,
-    AC_HELP_STRING([--with-shadow],[If you want shadow password support]),
-    [ if test "x$withval" != "xno"; then
-        use_shadow=yes
-      else
-        use_shadow=no
-      fi
-    ], [
-      use_shadow="$ac_use_shadow"
-    ])
-
-  if test "x$use_shadow" = xyes; then
-    AC_MSG_RESULT(yes)
-    AC_DEFINE(HAVE_SHADOW, 1, [Define if you use shadow passwords])
-  else
-    AC_MSG_RESULT(no)
-    LIBSHADOW=
-    LIBGEN=
-  fi
-
-  dnl finally make the relevant binaries setuid root, if we have shadow passwds.
-  dnl this still applies, if we could use it indirectly through pam.
-  if test "x$use_shadow" = xyes || 
-     ( test "x$use_pam" = xyes && test "x$ac_use_shadow" = xyes ); then
-      case $host in
-      *-*-freebsd* | *-*-netbsd* | *-*-openbsd*)
-	SETUIDFLAGS="-m 4755 -o root";;
-      *)
-	SETUIDFLAGS="-m 4755";;
-      esac
-  fi
-  AC_SUBST(SETUIDFLAGS)
-
-])
-
-AC_DEFUN([KDE_PASSWDLIBS], [
-  AC_REQUIRE([KDE_MISC_TESTS]) dnl for LIBCRYPT
-  AC_REQUIRE([KDE_PAM])
-  AC_REQUIRE([KDE_SHADOWPASSWD])
-
-  if test "x$use_pam" = "xyes"; then 
-    PASSWDLIBS="$PAMLIBS"
-  else
-    PASSWDLIBS="$LIBCRYPT $LIBSHADOW $LIBGEN"
-  fi
-
-  dnl FreeBSD uses a shadow-like setup, where /etc/passwd holds the users, but
-  dnl /etc/master.passwd holds the actual passwords.  /etc/master.passwd requires
-  dnl root to read, so kcheckpass needs to be root (even when using pam, since pam
-  dnl may need to read /etc/master.passwd).
-  case $host in
-  *-*-freebsd*)
-    SETUIDFLAGS="-m 4755 -o root"
-    ;;
-  *)
-    ;;
-  esac
-
-  AC_SUBST(PASSWDLIBS)
-])
-
-AC_DEFUN([KDE_CHECK_LIBDL],
-[
-AC_CHECK_LIB(dl, dlopen, [
-LIBDL="-ldl"
-ac_cv_have_dlfcn=yes
-])
-
-AC_CHECK_LIB(dld, shl_unload, [
-LIBDL="-ldld"
-ac_cv_have_shload=yes
-])
-
-AC_SUBST(LIBDL)
-])
-
-AC_DEFUN([KDE_CHECK_DLOPEN],
-[
-KDE_CHECK_LIBDL
-AC_CHECK_HEADERS(dlfcn.h dl.h)
-if test "$ac_cv_header_dlfcn_h" = "no"; then
-  ac_cv_have_dlfcn=no
-fi
-
-if test "$ac_cv_header_dl_h" = "no"; then
-  ac_cv_have_shload=no
-fi
-
-dnl XXX why change enable_dlopen? its already set by autoconf's AC_ARG_ENABLE
-dnl (MM)
-AC_ARG_ENABLE(dlopen,
-AC_HELP_STRING([--disable-dlopen],[link statically [default=no]]),
-enable_dlopen=$enableval,
-enable_dlopen=yes)
-
-# override the user's opinion, if we know it better ;)
-if test "$ac_cv_have_dlfcn" = "no" && test "$ac_cv_have_shload" = "no"; then
-  enable_dlopen=no
-fi
-
-if test "$ac_cv_have_dlfcn" = "yes"; then
-  AC_DEFINE_UNQUOTED(HAVE_DLFCN, 1, [Define if you have dlfcn])
-fi
-
-if test "$ac_cv_have_shload" = "yes"; then
-  AC_DEFINE_UNQUOTED(HAVE_SHLOAD, 1, [Define if you have shload])
-fi
-
-if test "$enable_dlopen" = no ; then
-  test -n "$1" && eval $1
-else
-  test -n "$2" && eval $2
-fi
-
-])
-
-AC_DEFUN([KDE_CHECK_DYNAMIC_LOADING],
-[
-KDE_CHECK_DLOPEN(libtool_enable_shared=yes, libtool_enable_static=no)
-KDE_PROG_LIBTOOL
-AC_MSG_CHECKING([dynamic loading])
-eval "`egrep '^build_libtool_libs=' libtool`"
-if test "$build_libtool_libs" = "yes" && test "$enable_dlopen" = "yes"; then
-  dynamic_loading=yes
-  AC_DEFINE_UNQUOTED(HAVE_DYNAMIC_LOADING)
-else
-  dynamic_loading=no
-fi
-AC_MSG_RESULT($dynamic_loading)
-if test "$dynamic_loading" = "yes"; then
-  $1
-else
-  $2
-fi
-])
-
-AC_DEFUN([KDE_ADD_INCLUDES],
-[
-if test -z "$1"; then
-  test_include="Pix.h"
-else
-  test_include="$1"
-fi
-
-AC_MSG_CHECKING([for libg++ ($test_include)])
-
-AC_CACHE_VAL(kde_cv_libgpp_includes,
-[
-kde_cv_libgpp_includes=no
-
-   for ac_dir in               \
-                               \
-     /usr/include/g++          \
-     /usr/include              \
-     /usr/unsupported/include  \
-     /opt/include              \
-     $extra_include            \
-     ; \
-   do
-     if test -r "$ac_dir/$test_include"; then
-       kde_cv_libgpp_includes=$ac_dir
-       break
-     fi
-   done
-])
-
-AC_MSG_RESULT($kde_cv_libgpp_includes)
-if test "$kde_cv_libgpp_includes" != "no"; then
-  all_includes="-I$kde_cv_libgpp_includes $all_includes $USER_INCLUDES"
-fi
-])
-])
-
-AC_DEFUN([KDE_CHECK_LIBPTHREAD],
-[
-  LIBPTHREAD=""
-
-  if test -n "$PTHREAD_LIBS"; then
-    PTHREAD_LIBS_save="$PTHREAD_LIBS"
-    PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
-    KDE_CHECK_LIB($PTHREAD_LIBS, pthread_create, [LIBPTHREAD="$PTHREAD_LIBS_save"] )
-    PTHREAD_LIBS="$PTHREAD_LIBS_save"
-  fi
-
-  if test -z "$LIBPTHREAD"; then
-    AC_CHECK_LIB(pthread, pthread_create, [LIBPTHREAD="-lpthread"] )
-  fi
-
-  AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN([KDE_CHECK_PTHREAD_OPTION],
-[
-      USE_THREADS=""
-      if test -z "$LIBPTHREAD"; then
-        KDE_CHECK_COMPILER_FLAG(pthread, [USE_THREADS="-D_THREAD_SAFE -pthread"])
-      fi
-
-    AH_VERBATIM(__svr_define, [
-#if defined(__SVR4) && !defined(__svr4__)
-#define __svr4__ 1
-#endif
-])
-    case $host_os in
- 	solaris*)
-		KDE_CHECK_COMPILER_FLAG(mt, [USE_THREADS="-mt"])
-                CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
-    		;;
-        freebsd*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
-                ;;
-        aix*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                LIBPTHREAD="$LIBPTHREAD -lc_r"
-                ;;
-        linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-                if test "$CXX" = "KCC"; then
-                  CXXFLAGS="$CXXFLAGS --thread_safe"
-		  NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
-                fi
-                ;;
-	*)
-		;;
-    esac
-    AC_SUBST(USE_THREADS)
-    AC_SUBST(LIBPTHREAD)
-])
-
-AC_DEFUN([KDE_CHECK_THREADING],
-[
-  AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-  AC_REQUIRE([KDE_CHECK_PTHREAD_OPTION])
-  dnl default is yes if libpthread is found and no if no libpthread is available
-  if test -z "$LIBPTHREAD"; then
-    if test -z "$USE_THREADS"; then
-      kde_check_threading_default=no
-    else
-      kde_check_threading_default=yes
-    fi
-  else
-    kde_check_threading_default=yes
-  fi
-  AC_ARG_ENABLE(threading,AC_HELP_STRING([--disable-threading],[disables threading even if libpthread found]),
-   kde_use_threading=$enableval, kde_use_threading=$kde_check_threading_default)
-  if test "x$kde_use_threading" = "xyes"; then
-    AC_DEFINE(HAVE_LIBPTHREAD, 1, [Define if you have a working libpthread (will enable threaded code)])
-  fi
-])
-
-AC_DEFUN([KDE_TRY_LINK_PYTHON],
-[
-if test "$kde_python_link_found" = no; then
-
-if test "$1" = normal; then
-  AC_MSG_CHECKING(if a Python application links)
-else
-  AC_MSG_CHECKING(if Python depends on $2)
-fi
-
-AC_CACHE_VAL(kde_cv_try_link_python_$1,
-[
-kde_save_cflags="$CFLAGS"
-CFLAGS="$CFLAGS $PYTHONINC"
-kde_save_libs="$LIBS"
-LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
-kde_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS $PYTHONLIB"
-
-AC_TRY_LINK(
-[
-#include <Python.h>
-],[
-	PySys_SetArgv(1, 0);
-],
-	[kde_cv_try_link_python_$1=yes],
-	[kde_cv_try_link_python_$1=no]
-)
-CFLAGS="$kde_save_cflags"
-LIBS="$kde_save_libs"
-LDFLAGS="$kde_save_ldflags"
-])
-
-if test "$kde_cv_try_link_python_$1" = "yes"; then
-  AC_MSG_RESULT(yes)
-  kde_python_link_found=yes
-  if test ! "$1" = normal; then
-    LIBPYTHON="$LIBPYTHON $2"
-  fi
-  $3
-else
-  AC_MSG_RESULT(no)
-  $4
-fi
-
-fi
-
-])
-
-AC_DEFUN([KDE_CHECK_PYTHON_DIR],
-[
-AC_MSG_CHECKING([for Python directory])
- 
-AC_CACHE_VAL(kde_cv_pythondir,
-[
-  if test -z "$PYTHONDIR"; then
-    kde_cv_pythondir=/usr/local
-  else
-    kde_cv_pythondir="$PYTHONDIR"
-  fi
-])
- 
-AC_ARG_WITH(pythondir,
-AC_HELP_STRING([--with-pythondir=pythondir],[use python installed in pythondir]),
-[
-  ac_python_dir=$withval
-], ac_python_dir=$kde_cv_pythondir
-)
- 
-AC_MSG_RESULT($ac_python_dir)
-])
-
-AC_DEFUN([KDE_CHECK_PYTHON_INTERN],
-[
-AC_REQUIRE([KDE_CHECK_LIBDL])
-AC_REQUIRE([KDE_CHECK_LIBPTHREAD])
-AC_REQUIRE([KDE_CHECK_PYTHON_DIR])
-
-if test -z "$1"; then
-  version="1.5"
-else
-  version="$1"
-fi
-
-AC_MSG_CHECKING([for Python$version])
-
-python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
-AC_FIND_FILE(Python.h, $python_incdirs, python_incdir)
-if test ! -r $python_incdir/Python.h; then
-  AC_FIND_FILE(python$version/Python.h, $python_incdirs, python_incdir)
-  python_incdir=$python_incdir/python$version
-  if test ! -r $python_incdir/Python.h; then
-    python_incdir=no
-  fi
-fi
-
-PYTHONINC=-I$python_incdir
-
-python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs"
-AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
-if test ! -r $python_libdir/libpython$version.so; then
-  AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
-  if test ! -r $python_libdir/libpython$version.a; then
-    AC_FIND_FILE(python$version/config/libpython$version.a, $python_libdirs, python_libdir)
-    python_libdir=$python_libdir/python$version/config
-    if test ! -r $python_libdir/libpython$version.a; then
-      python_libdir=no
-    fi
-  fi
-fi
-
-PYTHONLIB=-L$python_libdir
-kde_orig_LIBPYTHON=$LIBPYTHON
-if test -z "$LIBPYTHON"; then
-  LIBPYTHON=-lpython$version
-fi
-
-AC_FIND_FILE(python$version/copy.py, $python_libdirs, python_moddir)
-python_moddir=$python_moddir/python$version
-if test ! -r $python_moddir/copy.py; then
-  python_moddir=no
-fi
-
-PYTHONMODDIR=$python_moddir
-
-AC_MSG_RESULT(header $python_incdir library $python_libdir modules $python_moddir)
-
-if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
-   LIBPYTHON=$kde_orig_LIBPYTHON
-   test "x$PYTHONLIB" = "x-Lno" && PYTHONLIB=""
-   test "x$PYTHONINC" = "x-Ino" && PYTHONINC=""
-   $2
-else 
-  dnl Note: this test is very weak
-  kde_python_link_found=no
-  KDE_TRY_LINK_PYTHON(normal)
-  KDE_TRY_LINK_PYTHON(m, -lm)
-  KDE_TRY_LINK_PYTHON(pthread, $LIBPTHREAD)
-  KDE_TRY_LINK_PYTHON(tcl, -ltcl)
-  KDE_TRY_LINK_PYTHON(db2, -ldb2)
-  KDE_TRY_LINK_PYTHON(m_and_thread, [$LIBPTHREAD -lm])
-  KDE_TRY_LINK_PYTHON(m_and_thread_and_util, [$LIBPTHREAD -lm -lutil])
-  KDE_TRY_LINK_PYTHON(m_and_thread_and_db3, [$LIBPTHREAD -lm -ldb-3 -lutil])
-  KDE_TRY_LINK_PYTHON(pthread_and_db3, [$LIBPTHREAD -ldb-3])
-  KDE_TRY_LINK_PYTHON(m_and_thread_and_db, [$LIBPTHREAD -lm -ldb -ltermcap -lutil])
-  KDE_TRY_LINK_PYTHON(pthread_and_dl, [$LIBPTHREAD $LIBDL -lutil -lreadline -lncurses -lm])
-  KDE_TRY_LINK_PYTHON(pthread_and_panel_curses, [$LIBPTHREAD $LIBDL -lm -lpanel -lcurses])
-  KDE_TRY_LINK_PYTHON(m_and_thread_and_db_special, [$LIBPTHREAD -lm -ldb -lutil], [],
-	[AC_MSG_WARN([it seems, Python depends on another library.
-    Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
-    and contact the authors to let them know about this problem])
-	])
-
-  LIBPYTHON="$LIBPYTHON $LIBDL $LIBSOCKET"
-  AC_SUBST(PYTHONINC)
-  AC_SUBST(PYTHONLIB)
-  AC_SUBST(LIBPYTHON)
-  AC_SUBST(PYTHONMODDIR)
-  AC_DEFINE(HAVE_PYTHON, 1, [Define if you have the development files for python])
-fi
-
-])
-
-
-AC_DEFUN([KDE_CHECK_PYTHON],
-[
-  KDE_CHECK_PYTHON_INTERN("2.3", 
-   [KDE_CHECK_PYTHON_INTERN("2.2", 
-     [KDE_CHECK_PYTHON_INTERN("2.1", 
-       [KDE_CHECK_PYTHON_INTERN("2.0", 
-         [KDE_CHECK_PYTHON_INTERN($1, $2) ])
-       ])
-     ])
-   ])
-])
-
-AC_DEFUN([KDE_CHECK_STL],
-[
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-
-    AC_MSG_CHECKING([if C++ programs can be compiled])
-    AC_CACHE_VAL(kde_cv_stl_works,
-    [
-      AC_TRY_COMPILE([
-#include <string>
-using namespace std;
-],[
-  string astring="Hallo Welt.";
-  astring.erase(0, 6); // now astring is "Welt"
-  return 0;
-], kde_cv_stl_works=yes,
-   kde_cv_stl_works=no)
-])
-
-   AC_MSG_RESULT($kde_cv_stl_works)
-
-   if test "$kde_cv_stl_works" = "yes"; then
-     # back compatible
-	 AC_DEFINE_UNQUOTED(HAVE_SGI_STL, 1, [Define if you have a STL implementation by SGI])
-   else
-	 AC_MSG_ERROR([Your Installation isn't able to compile simple C++ programs.
-Check config.log for details - if you're using a Linux distribution you might miss
-a package named similiar to libstd++-dev.])
-   fi
-
-   CXXFLAGS="$ac_save_CXXFLAGS"
-   AC_LANG_RESTORE
-])
-
-AC_DEFUN([AC_FIND_QIMGIO],
-   [AC_REQUIRE([AC_FIND_JPEG])
-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
-AC_MSG_CHECKING([for qimgio])
-AC_CACHE_VAL(ac_cv_lib_qimgio,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_save_LIBS="$LIBS"
-ac_save_CXXFLAGS="$CXXFLAGS"
-LIBS="$all_libraries -lqimgio -lpng -lz $LIBJPEG $LIBQT"
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-AC_TRY_RUN(dnl
-[
-#include <qimageio.h>
-#include <qstring.h>
-int main() {
-		QString t = "hallo";
-		t.fill('t');
-		qInitImageIO();
-}
-],
-            ac_cv_lib_qimgio=yes,
-            ac_cv_lib_qimgio=no,
-	    ac_cv_lib_qimgio=no)
-LIBS="$ac_save_LIBS"
-CXXFLAGS="$ac_save_CXXFLAGS"
-AC_LANG_RESTORE
-])dnl
-if eval "test \"`echo $ac_cv_lib_qimgio`\" = yes"; then
-  LIBQIMGIO="-lqimgio -lpng -lz $LIBJPEG"
-  AC_MSG_RESULT(yes)
-  AC_DEFINE_UNQUOTED(HAVE_QIMGIO, 1, [Define if you have the Qt extension qimgio available])
-  AC_SUBST(LIBQIMGIO)
-else
-  AC_MSG_RESULT(not found)
-fi
-])
-
-AC_DEFUN([AM_DISABLE_LIBRARIES],
-[
-    AC_PROVIDE([AM_ENABLE_STATIC])
-    AC_PROVIDE([AM_ENABLE_SHARED])
-    enable_static=no
-    enable_shared=yes
-])
-
-
-AC_DEFUN([AC_CHECK_UTMP_FILE],
-[
-    AC_MSG_CHECKING([for utmp file])
-
-    AC_CACHE_VAL(kde_cv_utmp_file,
-    [
-    kde_cv_utmp_file=no
-
-    for ac_file in    \
-                      \
-	/var/run/utmp \
-	/var/adm/utmp \
-	/etc/utmp     \
-     ; \
-    do
-     if test -r "$ac_file"; then
-       kde_cv_utmp_file=$ac_file
-       break
-     fi
-    done
-    ])
-
-    if test "$kde_cv_utmp_file" != "no"; then
-	AC_DEFINE_UNQUOTED(UTMP, "$kde_cv_utmp_file", [Define the file for utmp entries])
-	$1
-	AC_MSG_RESULT($kde_cv_utmp_file)
-    else
-    	$2
-	AC_MSG_RESULT([non found])
-    fi
-])
-
-
-AC_DEFUN([KDE_CREATE_SUBDIRSLIST],
-[
-
-DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
-
-if test ! -s $srcdir/subdirs; then
-  dnl Note: Makefile.common creates subdirs, so this is just a fallback
-  TOPSUBDIRS=""
-  files=`cd $srcdir && ls -1`
-  dirs=`for i in $files; do if test -d $i; then echo $i; fi; done`
-  for i in $dirs; do
-    echo $i >> $srcdir/subdirs
-  done
-fi
-
-ac_topsubdirs=
-if test -s $srcdir/inst-apps; then
-  ac_topsubdirs="`cat $srcdir/inst-apps`"
-elif test -s $srcdir/subdirs; then
-  ac_topsubdirs="`cat $srcdir/subdirs`"
-fi
-
-for i in $ac_topsubdirs; do
-  AC_MSG_CHECKING([if $i should be compiled])
-  if test -d $srcdir/$i; then
-    install_it="yes"
-    for j in $DO_NOT_COMPILE; do
-      if test $i = $j; then
-        install_it="no"
-      fi
-    done
-  else
-    install_it="no"
-  fi
-  AC_MSG_RESULT($install_it)
-  vari=`echo $i | sed -e 's,[[-+.]],_,g'`
-  if test $install_it = "yes"; then
-    TOPSUBDIRS="$TOPSUBDIRS $i"
-    eval "$vari""_SUBDIR_included=yes"
-  else
-    eval "$vari""_SUBDIR_included=no"
-  fi
-done
-
-AC_SUBST(TOPSUBDIRS)
-])
-
-AC_DEFUN([KDE_CHECK_NAMESPACES],
-[
-AC_MSG_CHECKING(whether C++ compiler supports namespaces)
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-AC_TRY_COMPILE([
-],
-[
-namespace Foo {
-  extern int i;
-  namespace Bar {
-    extern int i;
-  }
-}
-
-int Foo::i = 0;
-int Foo::Bar::i = 1;
-],[
-  AC_MSG_RESULT(yes)
-  AC_DEFINE(HAVE_NAMESPACES)
-], [
-AC_MSG_RESULT(no)
-])
-AC_LANG_RESTORE
-])
-
-dnl ------------------------------------------------------------------------
-dnl Check for S_ISSOCK macro. Doesn't exist on Unix SCO. faure@kde.org
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_CHECK_S_ISSOCK],
-[
-AC_MSG_CHECKING(for S_ISSOCK)
-AC_CACHE_VAL(ac_cv_have_s_issock,
-[
-AC_TRY_LINK(
-[
-#include <sys/stat.h>
-],
-[
-struct stat buff;
-int b = S_ISSOCK( buff.st_mode );
-],
-ac_cv_have_s_issock=yes,
-ac_cv_have_s_issock=no)
-])
-AC_MSG_RESULT($ac_cv_have_s_issock)
-if test "$ac_cv_have_s_issock" = "yes"; then
-  AC_DEFINE_UNQUOTED(HAVE_S_ISSOCK, 1, [Define if sys/stat.h declares S_ISSOCK.])
-fi
-
-AH_VERBATIM(_ISSOCK,
-[
-#ifndef HAVE_S_ISSOCK
-#define HAVE_S_ISSOCK
-#define S_ISSOCK(mode) (1==0)
-#endif
-])
-
-])
-
-dnl ------------------------------------------------------------------------
-dnl Check for MAXPATHLEN macro, defines KDEMAXPATHLEN. faure@kde.org
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_CHECK_KDEMAXPATHLEN],
-[
-AC_MSG_CHECKING(for MAXPATHLEN)
-AC_CACHE_VAL(ac_cv_maxpathlen,
-[
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include <sys/param.h>
-#ifndef MAXPATHLEN
-#define MAXPATHLEN 1024
-#endif
-
-KDE_HELLO MAXPATHLEN
-
-EOF
-
-ac_try="$ac_cpp conftest.$ac_ext 2>/dev/null | grep '^KDE_HELLO' >conftest.out"
-
-if AC_TRY_EVAL(ac_try) && test -s conftest.out; then
-    ac_cv_maxpathlen=`sed 's#KDE_HELLO ##' conftest.out`
-else
-    ac_cv_maxpathlen=1024
-fi
-
-rm conftest.*
-
-])
-AC_MSG_RESULT($ac_cv_maxpathlen)
-AC_DEFINE_UNQUOTED(KDEMAXPATHLEN,$ac_cv_maxpathlen, [Define a safe value for MAXPATHLEN] )
-])
-
-AC_DEFUN([KDE_CHECK_HEADER],
-[
-   AC_LANG_SAVE
-   kde_safe_cppflags=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $all_includes"
-   AC_LANG_CPLUSPLUS
-   AC_CHECK_HEADER([$1], [$2], [$3], [$4])
-   CPPFLAGS=$kde_safe_cppflags
-   AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_CHECK_HEADERS],
-[
-   AH_CHECK_HEADERS([$1])
-   AC_LANG_SAVE
-   kde_safe_cppflags=$CPPFLAGS
-   CPPFLAGS="$CPPFLAGS $all_includes"
-   AC_LANG_CPLUSPLUS
-   AC_CHECK_HEADERS([$1], [$2], [$3], [$4])
-   CPPFLAGS=$kde_safe_cppflags
-   AC_LANG_RESTORE
-])
-
-AC_DEFUN([KDE_FAST_CONFIGURE],
-[
-  dnl makes configure fast (needs perl)
-  AC_ARG_ENABLE(fast-perl, AC_HELP_STRING([--disable-fast-perl],[disable fast Makefile generation (needs perl)]),
-      with_fast_perl=$enableval, with_fast_perl=yes)
-])
-
-AC_DEFUN([KDE_CONF_FILES],
-[
-  val=
-  if test -f $srcdir/configure.files ; then
-    val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files`
-  fi
-  CONF_FILES=
-  if test -n "$val" ; then
-    for i in $val ; do
-      CONF_FILES="$CONF_FILES $i"
-    done
-  fi
-  AC_SUBST(CONF_FILES)
-])dnl
-
-AC_DEFUN([KDE_SET_PREFIX],
-[
-  unset CDPATH
-  dnl make $KDEDIR the default for the installation
-  AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde})
-
-  if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
-    ac_configure_args="$ac_configure_args --prefix=$prefix"
-  fi
-  # And delete superfluous '/' to make compares easier
-  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-  KDE_FAST_CONFIGURE
-  KDE_CONF_FILES
-])
-
-pushdef([AC_PROG_INSTALL],
-[
-  dnl our own version, testing for a -p flag
-  popdef([AC_PROG_INSTALL])
-  dnl as AC_PROG_INSTALL works as it works we first have
-  dnl to save if the user didn't specify INSTALL, as the
-  dnl autoconf one overwrites INSTALL and we have no chance to find
-  dnl out afterwards
-  test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
-  test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM
-  test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT
-  AC_PROG_INSTALL
-
-  if test -z "$kde_save_INSTALL_given" ; then
-    # OK, user hasn't given any INSTALL, autoconf found one for us
-    # now we test, if it supports the -p flag
-    AC_MSG_CHECKING(for -p flag to install)
-    rm -f confinst.$$.* > /dev/null 2>&1
-    echo "Testtest" > confinst.$$.orig
-    ac_res=no
-    if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then
-      if test -f confinst.$$.new ; then
-        # OK, -p seems to do no harm to install
-	INSTALL="${INSTALL} -p"
-	ac_res=yes
-      fi
-    fi
-    rm -f confinst.$$.*
-    AC_MSG_RESULT($ac_res)
-  fi
-  dnl the following tries to resolve some signs and wonders coming up
-  dnl with different autoconf/automake versions
-  dnl e.g.:
-  dnl  *automake 1.4 install-strip sets A_M_INSTALL_PROGRAM_FLAGS to -s
-  dnl   and has INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(A_M_INSTALL_PROGRAM_FLAGS)
-  dnl   it header-vars.am, so there the actual INSTALL_PROGRAM gets the -s
-  dnl  *automake 1.4a (and above) use INSTALL_STRIP_FLAG and only has
-  dnl   INSTALL_PROGRAM = @INSTALL_PROGRAM@ there, but changes the
-  dnl   install-@DIR@PROGRAMS targets to explicitly use that flag
-  dnl  *autoconf 2.13 is dumb, and thinks it can use INSTALL_PROGRAM as
-  dnl   INSTALL_SCRIPT, which breaks with automake <= 1.4
-  dnl  *autoconf >2.13 (since 10.Apr 1999) has not that failure
-  dnl  *sometimes KDE does not use the install-@DIR@PROGRAM targets from
-  dnl   automake (due to broken Makefile.am or whatever) to install programs,
-  dnl   and so does not see the -s flag in automake > 1.4
-  dnl to clean up that mess we:
-  dnl  +set INSTALL_PROGRAM to use INSTALL_STRIP_FLAG
-  dnl   which cleans KDE's program with automake > 1.4;
-  dnl  +set INSTALL_SCRIPT to only use INSTALL, to clean up autoconf's problems
-  dnl   with automake<=1.4
-  dnl  note that dues to this sometimes two '-s' flags are used (if KDE
-  dnl   properly uses install-@DIR@PROGRAMS, but I don't care
-  dnl
-  dnl And to all this comes, that I even can't write in comments variable
-  dnl  names used by automake, because it is so stupid to think I wanted to
-  dnl  _use_ them, therefor I have written A_M_... instead of AM_
-  dnl hmm, I wanted to say something ... ahh yes: Arghhh.
-
-  if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-    INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)'
-  fi
-  if test -z "$kde_save_INSTALL_SCRIPT_given" ; then
-    INSTALL_SCRIPT='${INSTALL}'
-  fi
-])dnl
-
-AC_DEFUN([KDE_LANG_CPLUSPLUS],
-[AC_LANG_CPLUSPLUS
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AC_FD_CC'
-pushdef([AC_LANG_CPLUSPLUS], [popdef([AC_LANG_CPLUSPLUS]) KDE_LANG_CPLUSPLUS])
-])
-
-pushdef([AC_LANG_CPLUSPLUS],
-[popdef([AC_LANG_CPLUSPLUS])
-KDE_LANG_CPLUSPLUS
-])
-
-AC_DEFUN([KDE_CHECK_LONG_LONG],
-[
-AC_MSG_CHECKING(for long long)
-AC_CACHE_VAL(kde_cv_c_long_long,
-[
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  AC_TRY_LINK([], [
-  long long foo = 0;
-  foo = foo+1;
-  ],
-  kde_cv_c_long_long=yes, kde_cv_c_long_long=no)
-  AC_LANG_RESTORE
-])
-AC_MSG_RESULT($kde_cv_c_long_long)
-if test "$kde_cv_c_long_long" = yes; then
-   AC_DEFINE(HAVE_LONG_LONG, 1, [Define if you have long long as datatype])
-fi
-])
-
-AC_DEFUN([KDE_CHECK_LIB],
-[
-     kde_save_LDFLAGS="$LDFLAGS"
-     dnl AC_CHECK_LIB modifies LIBS, so save it here
-     kde_save_LIBS="$LIBS"
-     LDFLAGS="$LDFLAGS $all_libraries"
-     case $host_os in
-      aix*) LDFLAGS="-brtl $LDFLAGS"
-	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-	;;
-     esac
-     AC_CHECK_LIB($1, $2, $3, $4, $5)
-     LDFLAGS="$kde_save_LDFLAGS"
-     LIBS="$kde_save_LIBS"
-])
-
-AC_DEFUN([KDE_JAVA_PREFIX],
-[
-	dir=`dirname "$1"`
-	base=`basename "$1"`
-	list=`ls -1 $dir 2> /dev/null`
-	for entry in $list; do 
-		if test -d $dir/$entry/bin; then
-			case $entry in
-			   $base)
-				javadirs="$javadirs $dir/$entry/bin"
-				;;
-			esac
-		elif test -d $dir/$entry/jre/bin; then
-			case $entry in
-			   $base)
-				javadirs="$javadirs $dir/$entry/jre/bin"
-				;;
-			esac
-		fi
-	done
-])
-
-dnl KDE_CHEC_JAVA_DIR(onlyjre)
-AC_DEFUN([KDE_CHECK_JAVA_DIR],
-[
-
-AC_ARG_WITH(java,
-AC_HELP_STRING([--with-java=javadir],[use java installed in javadir, --without-java disables]),
-[  ac_java_dir=$withval
-], ac_java_dir=""
-)
-
-AC_MSG_CHECKING([for Java])
-
-dnl at this point ac_java_dir is either a dir, 'no' to disable, or '' to say look in $PATH
-if test "x$ac_java_dir" = "xno"; then
-   kde_java_bindir=no
-   kde_java_includedir=no
-   kde_java_libjvmdir=no
-   kde_java_libgcjdir=no
-   kde_java_libhpidir=no
-else
-  if test "x$ac_java_dir" = "x"; then
-     
-     
-      dnl No option set -> collect list of candidate paths
-      if test -n "$JAVA_HOME"; then
-        KDE_JAVA_PREFIX($JAVA_HOME)
-      fi
-      KDE_JAVA_PREFIX(/usr/j2se)
-      KDE_JAVA_PREFIX(/usr/lib/j2se)
-      KDE_JAVA_PREFIX(/usr/j*dk*)
-      KDE_JAVA_PREFIX(/usr/lib/j*dk*)
-      KDE_JAVA_PREFIX(/opt/j*sdk*)
-      KDE_JAVA_PREFIX(/usr/lib/java*)
-      KDE_JAVA_PREFIX(/usr/java*)
-      KDE_JAVA_PREFIX(/usr/java/j*dk*)
-      KDE_JAVA_PREFIX(/usr/java/j*re*)
-      KDE_JAVA_PREFIX(/usr/lib/SunJava2*)
-      KDE_JAVA_PREFIX(/usr/lib/SunJava*)
-      KDE_JAVA_PREFIX(/usr/lib/IBMJava2*)
-      KDE_JAVA_PREFIX(/usr/lib/IBMJava*)
-      KDE_JAVA_PREFIX(/opt/java*)
-
-      kde_cv_path="NONE"
-      kde_save_IFS=$IFS
-      IFS=':'
-      for dir in $PATH; do
-	  if test -d "$dir"; then
-	      javadirs="$javadirs $dir"
-	  fi
-      done
-      IFS=$kde_save_IFS
-      jredirs=
-
-      dnl Now javadirs contains a list of paths that exist, all ending with bin/
-      for dir in $javadirs; do
-          dnl Check for the java executable
-	  if test -x "$dir/java"; then
-	      dnl And also check for a libjvm.so somewhere under there
-	      dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
-              if test "$dir" != "/usr/bin"; then
-                  libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-		  if test ! -f $libjvmdir/libjvm.so; then continue; fi
-		  jredirs="$jredirs $dir"
-	      fi
-	  fi
-      done
-
-      dnl Now jredirs contains a reduced list, of paths where both java and ../**/libjvm.so was found
-      JAVAC=
-      JAVA=
-      kde_java_bindir=no
-      for dir in $jredirs; do
-	  JAVA="$dir/java"
-	  kde_java_bindir=$dir
-	  if test -x "$dir/javac"; then
-		JAVAC="$dir/javac"
-                break
-	  fi
-      done
-
-      if test -n "$JAVAC"; then
-          dnl this substitution might not work - well, we test for jni.h below
-          kde_java_includedir=`echo $JAVAC | sed -e 's,bin/javac$,include/,'`
-      else
-          kde_java_includedir=no
-      fi
-  else
-    dnl config option set
-    kde_java_bindir=$ac_java_dir/bin
-    if test -x $ac_java_dir/bin/java && test ! -x $ac_java_dir/bin/javac; then
-	kde_java_includedir=no
-    else
-        kde_java_includedir=$ac_java_dir/include
-    fi
-  fi
-fi
-
-dnl At this point kde_java_bindir and kde_java_includedir are either set or "no"
-if test "x$kde_java_bindir" != "xno"; then
-
-  dnl Look for libjvm.so
-  kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
-  dnl Look for libgcj.so
-  kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
-  dnl Look for libhpi.so and avoid green threads
-  kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
-
-  dnl Now check everything's fine under there
-  dnl the include dir is our flag for having the JDK
-  if test -d "$kde_java_includedir"; then
-    if test ! -x "$kde_java_bindir/javac"; then
-      AC_MSG_ERROR([javac not found under $kde_java_bindir - it seems you passed a wrong --with-java.])
-    fi
-    if test ! -x "$kde_java_bindir/javah"; then
-      AC_MSG_ERROR([javah not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-    fi
-    if test ! -x "$kde_java_bindir/jar"; then
-      AC_MSG_ERROR([jar not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-    fi
-    if test ! -r "$kde_java_includedir/jni.h"; then
-      AC_MSG_ERROR([jni.h not found under $kde_java_includedir. Use --with-java or --without-java.])
-    fi
-
-    jni_includes="-I$kde_java_includedir"
-    dnl Strange thing, jni.h requires jni_md.h which is under genunix here..
-    dnl and under linux here.. 
-    
-    dnl not needed for gcj
-
-    if test "x$kde_java_libgcjdir" = "x"; then 
-      test -d "$kde_java_includedir/linux" && jni_includes="$jni_includes -I$kde_java_includedir/linux"
-      test -d "$kde_java_includedir/solaris" && jni_includes="$jni_includes -I$kde_java_includedir/solaris"
-      test -d "$kde_java_includedir/genunix" && jni_includes="$jni_includes -I$kde_java_includedir/genunix"
-    fi
-
-  else
-    JAVAC=
-    jni_includes=
-  fi
-
-  if test "x$kde_java_libgcjdir" = "x"; then 
-     if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
-        AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
-     fi 
-  else
-     if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
-        AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.])
-     fi 
-  fi
-
-  if test ! -x "$kde_java_bindir/java"; then
-      AC_MSG_ERROR([java not found under $kde_java_bindir. javac was found though! Use --with-java or --without-java.])
-  fi
-
-  dnl not needed for gcj compile
-
-  if test "x$kde_java_libgcjdir" = "x"; then 
-      if test ! -r "$kde_java_libhpidir/libhpi.so"; then
-        AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
-      fi
-  fi
-
-  if test -n "$jni_includes"; then
-    dnl Check for JNI version
-    AC_LANG_SAVE
-    AC_LANG_CPLUSPLUS
-    ac_cxxflags_safe="$CXXFLAGS"
-    CXXFLAGS="$CXXFLAGS $all_includes $jni_includes"
-
-    AC_TRY_COMPILE([
-  #include <jni.h>
-	      ],
-	      [
-  #ifndef JNI_VERSION_1_2
-  Syntax Error
-  #endif
-	      ],[ kde_jni_works=yes ],
-	      [ kde_jni_works=no ])
-
-    if test $kde_jni_works = no; then
-      AC_MSG_ERROR([Incorrect version of $kde_java_includedir/jni.h.
-		    You need to have Java Development Kit (JDK) version 1.2. 
-
-		    Use --with-java to specify another location.
-		    Use --without-java to configure without java support.
-		    Or download a newer JDK and try again. 
-		    See e.g. http://java.sun.com/products/jdk/1.2 ])
-    fi
-
-    CXXFLAGS="$ac_cxxflags_safe"    
-    AC_LANG_RESTORE
-
-    dnl All tests ok, inform and subst the variables
-
-    JAVAC=$kde_java_bindir/javac
-    JAVAH=$kde_java_bindir/javah
-    JAR=$kde_java_bindir/jar
-    AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-    if test "x$kde_java_libgcjdir" = "x"; then 
-      JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
-    else
-      JVMLIBS="-L$kde_java_libgcjdir -lgcj"
-    fi
-    AC_MSG_RESULT([java JDK in $kde_java_bindir])
-
-  else
-      AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-      AC_MSG_RESULT([java JRE in $kde_java_bindir])
-  fi
-elif test -d "/Library/Java/Home"; then
-  kde_java_bindir="/Library/Java/Home/bin"
-  jni_includes="-I/Library/Java/Home/include"
-
-  JAVAC=$kde_java_bindir/javac
-  JAVAH=$kde_java_bindir/javah
-  JAR=$kde_java_bindir/jar
-  JVMLIBS="-Xlinker -framework -Xlinker JavaVM"
-
-  AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
-  AC_MSG_RESULT([Apple Java Framework])
-else
-  AC_MSG_RESULT([none found])
-fi
-
-AC_SUBST(JAVAC)
-AC_SUBST(JAVAH)
-AC_SUBST(JAR)
-AC_SUBST(JVMLIBS)
-AC_SUBST(jni_includes)
-
-# for backward compat
-kde_cv_java_includedir=$kde_java_includedir
-kde_cv_java_bindir=$kde_java_bindir
-])
-
-dnl this is a redefinition of autoconf 2.5x's AC_FOREACH.
-dnl When the argument list becomes big, as in KDE for AC_OUTPUT in
-dnl big packages, m4_foreach is dog-slow.  So use our own version of
-dnl it.  (matz@kde.org)
-m4_define([mm_foreach],
-[m4_pushdef([$1])_mm_foreach($@)m4_popdef([$1])])
-m4_define([mm_car], [[$1]])
-m4_define([mm_car2], [[$@]])
-m4_define([_mm_foreach],
-[m4_if(m4_quote($2), [], [],
-       [m4_define([$1], mm_car($2))$3[]_mm_foreach([$1],
-                                                   mm_car2(m4_shift($2)),
-                                                   [$3])])])
-m4_define([AC_FOREACH],
-[mm_foreach([$1], m4_split(m4_normalize([$2])), [$3])])
-
-AC_DEFUN([KDE_NEED_FLEX],
-[
-kde_libs_safe=$LIBS
-LIBS="$LIBS $USER_LDFLAGS"
-AM_PROG_LEX
-LIBS=$kde_libs_safe
-if test -z "$LEXLIB"; then
-    AC_MSG_ERROR([You need to have flex installed.])
-fi
-AC_SUBST(LEXLIB)
-])
-
-AC_DEFUN([AC_PATH_QTOPIA],
-[
-  dnl TODO: use AC_CACHE_VAL
-
-  if test -z "$1"; then
-    qtopia_minver_maj=1
-    qtopia_minver_min=5
-    qtopia_minver_pat=0
-  else
-    qtopia_minver_maj=`echo "$1" | sed -e "s/^\(.*\)\..*\..*$/\1/"`
-    qtopia_minver_min=`echo "$1" | sed -e "s/^.*\.\(.*\)\..*$/\1/"`
-    qtopia_minver_pat=`echo "$1" | sed -e "s/^.*\..*\.\(.*\)$/\1/"`
-  fi
-
-  qtopia_minver="$qtopia_minver_maj$qtopia_minver_min$qtopia_minver_pat"
-  qtopia_minverstr="$qtopia_minver_maj.$qtopia_minver_min.$qtopia_minver_pat"
-
-  AC_REQUIRE([AC_PATH_QT])
-
-  AC_MSG_CHECKING([for Qtopia])
-
-  LIB_QTOPIA="-lqpe"
-  AC_SUBST(LIB_QTOPIA)
-
-  kde_qtopia_dirs="$QPEDIR /opt/Qtopia"
-
-  ac_qtopia_incdir=NO
-
-  AC_ARG_WITH(qtopia-dir,
-              AC_HELP_STRING([--with-qtopia-dir=DIR],[where the root of Qtopia is installed]),
-              [  ac_qtopia_incdir="$withval"/include] ) 
-  
-  qtopia_incdirs=""
-  for dir in $kde_qtopia_dirs; do
-    qtopia_incdirs="$qtopia_incdirs $dir/include"
-  done
-
-  if test ! "$ac_qtopia_incdir" = "NO"; then
-    qtopia_incdirs="$ac_qtopia_incdir $qtopia_incdirs"
-  fi
-
-  qtopia_incdir=""
-  AC_FIND_FILE(qpe/qpeapplication.h, $qtopia_incdirs, qtopia_incdir)
-  ac_qtopia_incdir="$qtopia_incdir"
-
-  if test -z "$qtopia_incdir"; then
-    AC_MSG_ERROR([Cannot find Qtopia headers. Please check your installation.])
-  fi
-
-  qtopia_ver_maj=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION "\(.*\)\..*\..*".*,\1,p'`;
-  qtopia_ver_min=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\.\(.*\)\..*".*,\1,p'`;
-  qtopia_ver_pat=`cat $qtopia_incdir/qpe/version.h | sed -n -e 's,.*QPE_VERSION ".*\..*\.\(.*\)".*,\1,p'`;
-
-  qtopia_ver="$qtopia_ver_maj$qtopia_ver_min$qtopia_ver_pat"
-  qtopia_verstr="$qtopia_ver_maj.$qtopia_ver_min.$qtopia_ver_pat"
-  if test "$qtopia_ver" -lt "$qtopia_minver"; then
-    AC_MSG_ERROR([found Qtopia version $qtopia_verstr but version $qtopia_minverstr
-is required.])
-  fi
-
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-
-  ac_cxxflags_safe="$CXXFLAGS"
-  ac_ldflags_safe="$LDFLAGS"
-  ac_libs_safe="$LIBS"
-
-  CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes"
-  LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-  LIBS="$LIBS $LIB_QTOPIA $LIBQT"
-
-  cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qpe/qpeapplication.h>
-#include <qpe/version.h>
-
-int main( int argc, char **argv )
-{
-    QPEApplication app( argc, argv );
-    return 0;
-}
-EOF
-
-  if AC_TRY_EVAL(ac_link) && test -s conftest; then
-    rm -f conftest*
-  else
-    rm -f conftest*
-    AC_MSG_ERROR([Cannot link small Qtopia Application. For more details look at
-the end of config.log])
-  fi
-
-  CXXFLAGS="$ac_cxxflags_safe"
-  LDFLAGS="$ac_ldflags_safe"
-  LIBS="$ac_libs_safe"
-
-  AC_LANG_RESTORE
-
-  QTOPIA_INCLUDES="-I$qtopia_incdir"
-  AC_SUBST(QTOPIA_INCLUDES)
-
-  AC_MSG_RESULT([found version $qtopia_verstr with headers at $qtopia_incdir])
-])
-
-
-AC_DEFUN([KDE_INIT_DOXYGEN],
-[
-AC_MSG_CHECKING([for Qt docs])
-kde_qtdir=
-if test "${with_qt_dir+set}" = set; then
-  kde_qtdir="$with_qt_dir"
-fi
-
-AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
-AC_MSG_RESULT($QTDOCDIR)
-
-AC_SUBST(QTDOCDIR)
-
-KDE_FIND_PATH(dot, DOT, [], [])
-if test -n "$DOT"; then
-  KDE_HAVE_DOT="YES"
-else
-  KDE_HAVE_DOT="NO"
-fi
-AC_SUBST(KDE_HAVE_DOT)
-KDE_FIND_PATH(doxygen, DOXYGEN, [], [])
-AC_SUBST(DOXYGEN)
-
-DOXYGEN_PROJECT_NAME="$1"
-DOXYGEN_PROJECT_NUMBER="$2"
-AC_SUBST(DOXYGEN_PROJECT_NAME)
-AC_SUBST(DOXYGEN_PROJECT_NUMBER)
-
-KDE_HAS_DOXYGEN=no
-if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
-  KDE_HAS_DOXYGEN=yes
-fi
-AC_SUBST(KDE_HAS_DOXYGEN)
-
-])
-
-
-AC_DEFUN([AC_FIND_BZIP2],
-[
-AC_MSG_CHECKING([for bzDecompress in libbz2])
-AC_CACHE_VAL(ac_cv_lib_bzip2,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-kde_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lbz2 $LIBSOCKET"
-kde_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-AC_TRY_LINK(dnl
-[
-#define BZ_NO_STDIO
-#include<bzlib.h>
-],
-            [ bz_stream s; (void) bzDecompress(&s); ],
-            eval "ac_cv_lib_bzip2='-lbz2'",
-            eval "ac_cv_lib_bzip2=no")
-LIBS="$kde_save_LIBS"
-CXXFLAGS="$kde_save_CXXFLAGS"
-AC_LANG_RESTORE
-])dnl
-AC_MSG_RESULT($ac_cv_lib_bzip2)
-
-if test ! "$ac_cv_lib_bzip2" = no; then
-  BZIP2DIR=bzip2
-
-  LIBBZ2="$ac_cv_lib_bzip2"
-  AC_SUBST(LIBBZ2)
-
-else
-
-   cxx_shared_flag=
-   ld_shared_flag=
-   KDE_CHECK_COMPILER_FLAG(shared, [
-	ld_shared_flag="-shared"
-   ])
-   KDE_CHECK_COMPILER_FLAG(fPIC, [
-        cxx_shared_flag="-fPIC"
-   ])
-
-   AC_MSG_CHECKING([for BZ2_bzDecompress in (shared) libbz2])
-   AC_CACHE_VAL(ac_cv_lib_bzip2_prefix,
-   [
-   AC_LANG_SAVE
-   AC_LANG_CPLUSPLUS
-   kde_save_LIBS="$LIBS"
-   LIBS="$all_libraries $USER_LDFLAGS $ld_shared_flag -lbz2 $LIBSOCKET"
-   kde_save_CXXFLAGS="$CXXFLAGS"
-   CXXFLAGS="$CFLAGS $cxx_shared_flag $all_includes $USER_INCLUDES"
-
-   AC_TRY_LINK(dnl
-   [
-   #define BZ_NO_STDIO
-   #include<bzlib.h>
-   ],
-               [ bz_stream s; (void) BZ2_bzDecompress(&s); ],
-               eval "ac_cv_lib_bzip2_prefix='-lbz2'",
-               eval "ac_cv_lib_bzip2_prefix=no")
-   LIBS="$kde_save_LIBS"
-   CXXFLAGS="$kde_save_CXXFLAGS"
-   AC_LANG_RESTORE
-   ])dnl
-
-   AC_MSG_RESULT($ac_cv_lib_bzip2_prefix)
-   
-   if test ! "$ac_cv_lib_bzip2_prefix" = no; then
-     BZIP2DIR=bzip2
-    
-     LIBBZ2="$ac_cv_lib_bzip2_prefix"
-     AC_SUBST(LIBBZ2)
-
-     AC_DEFINE(NEED_BZ2_PREFIX, 1, [Define if the libbz2 functions need the BZ2_ prefix])
-   dnl else, we just ignore this
-   fi
-
-fi
-AM_CONDITIONAL(include_BZIP2, test -n "$BZIP2DIR")
-])
-
-dnl ------------------------------------------------------------------------
-dnl Try to find the SSL headers and libraries.
-dnl $(SSL_LDFLAGS) will be -Lsslliblocation (if needed)
-dnl and $(SSL_INCLUDES) will be -Isslhdrlocation (if needed)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([KDE_CHECK_SSL],
-[
-LIBSSL="-lssl -lcrypto"
-AC_REQUIRE([KDE_CHECK_LIB64])
-
-ac_ssl_includes=NO ac_ssl_libraries=NO
-ssl_libraries=""
-ssl_includes=""
-AC_ARG_WITH(ssl-dir,
-    AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
-    [  ac_ssl_includes="$withval"/include
-       ac_ssl_libraries="$withval"/lib$kdelibsuff
-    ])
-
-want_ssl=yes
-AC_ARG_WITH(ssl,
-    AC_HELP_STRING([--without-ssl],[disable SSL checks]),
-    [want_ssl=$withval])
-
-if test $want_ssl = yes; then
-
-AC_MSG_CHECKING(for OpenSSL)
-
-AC_CACHE_VAL(ac_cv_have_ssl,
-[#try to guess OpenSSL locations
-  
-  ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes"
-  ssl_incdirs="$ac_ssl_includes $ssl_incdirs"
-  AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
-  ac_ssl_includes="$ssl_incdir"
-
-  ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs"
-  if test ! "$ac_ssl_libraries" = "NO"; then
-    ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
-  fi
-
-  test=NONE
-  ssl_libdir=NONE
-  for dir in $ssl_libdirs; do
-    try="ls -1 $dir/libssl*"
-    if test=`eval $try 2> /dev/null`; then ssl_libdir=$dir; break; else echo "tried $dir" >&AC_FD_CC ; fi
-  done
-
-  ac_ssl_libraries="$ssl_libdir"
-
-  ac_ldflags_safe="$LDFLAGS"
-  ac_libs_safe="$LIBS"
-
-  LDFLAGS="$LDFLAGS -L$ssl_libdir $all_libraries"
-  LIBS="$LIBS $LIBSSL -lRSAglue -lrsaref"
-
-  AC_TRY_LINK(,void RSAPrivateEncrypt(void);RSAPrivateEncrypt();,
-  ac_ssl_rsaref="yes"
-  ,
-  ac_ssl_rsaref="no"
-  )
-
-  LDFLAGS="$ac_ldflags_safe"
-  LIBS="$ac_libs_safe"
-
-  if test "$ac_ssl_includes" = NO || test "$ac_ssl_libraries" = NO; then
-    have_ssl=no
-  else
-    have_ssl=yes;
-  fi
-
-  ])
-
-  eval "$ac_cv_have_ssl"
-
-  AC_MSG_RESULT([libraries $ac_ssl_libraries, headers $ac_ssl_includes])
-
-  AC_MSG_CHECKING([whether OpenSSL uses rsaref])
-  AC_MSG_RESULT($ac_ssl_rsaref)
-
-  AC_MSG_CHECKING([for easter eggs])
-  AC_MSG_RESULT([none found])
-
-else
-  have_ssl=no
-fi
-
-if test "$have_ssl" = yes; then
-  AC_MSG_CHECKING(for OpenSSL version)
-  dnl Check for SSL version
-  AC_CACHE_VAL(ac_cv_ssl_version,
-  [
-
-    cat >conftest.$ac_ext <<EOF
-#include <openssl/opensslv.h>
-#include <stdio.h>
-    int main() {
- 
-#ifndef OPENSSL_VERSION_NUMBER
-      printf("ssl_version=\\"error\\"\n");
-#else
-      if (OPENSSL_VERSION_NUMBER < 0x00906000)
-        printf("ssl_version=\\"old\\"\n");
-      else
-        printf("ssl_version=\\"ok\\"\n");
-#endif
-     return (0);
-    }
-EOF
-
-    ac_save_CPPFLAGS=$CPPFLAGS
-    if test "$ac_ssl_includes" != "/usr/include"; then
-        CPPFLAGS="$CPPFLAGS -I$ac_ssl_includes"
-    fi
-
-    if AC_TRY_EVAL(ac_link); then 
-
-      if eval `./conftest 2>&5`; then
-        if test $ssl_version = error; then
-          AC_MSG_ERROR([$ssl_incdir/openssl/opensslv.h doesn't define OPENSSL_VERSION_NUMBER !])
-        else
-          if test $ssl_version = old; then
-            AC_MSG_WARN([OpenSSL version too old. Upgrade to 0.9.6 at least, see http://www.openssl.org. SSL support disabled.])
-            have_ssl=no
-          fi
-        fi
-        ac_cv_ssl_version="ssl_version=$ssl_version"
-      else
-        AC_MSG_ERROR([Your system couldn't run a small SSL test program.
-        Check config.log, and if you can't figure it out, send a mail to 
-        David Faure <faure@kde.org>, attaching your config.log])
-      fi
-
-    else
-      AC_MSG_ERROR([Your system couldn't link a small SSL test program.
-      Check config.log, and if you can't figure it out, send a mail to 
-      David Faure <faure@kde.org>, attaching your config.log])
-    fi 
-    CPPFLAGS=$ac_save_CPPFLAGS
-
-  ])
-
-  eval "$ac_cv_ssl_version"
-  AC_MSG_RESULT($ssl_version)
-fi
-
-if test "$have_ssl" != yes; then
-  LIBSSL="";
-else
-  AC_DEFINE(HAVE_SSL, 1, [If we are going to use OpenSSL])
-  ac_cv_have_ssl="have_ssl=yes \
-    ac_ssl_includes=$ac_ssl_includes ac_ssl_libraries=$ac_ssl_libraries ac_ssl_rsaref=$ac_ssl_rsaref"
-  
-  
-  ssl_libraries="$ac_ssl_libraries"
-  ssl_includes="$ac_ssl_includes"
-
-  if test "$ac_ssl_rsaref" = yes; then
-    LIBSSL="-lssl -lcrypto -lRSAglue -lrsaref" 
-  fi
-
-  if test $ssl_version = "old"; then
-    AC_DEFINE(HAVE_OLD_SSL_API, 1, [Define if you have OpenSSL < 0.9.6])
-  fi
-fi
-
-SSL_INCLUDES=
-
-if test "$ssl_includes" = "/usr/include"; then
-  if test -f /usr/kerberos/include/krb5.h; then
-	SSL_INCLUDES="-I/usr/kerberos/include"
-  fi
-elif test  "$ssl_includes" != "/usr/local/include" && test -n "$ssl_includes"; then
-  SSL_INCLUDES="-I$ssl_includes"
-fi
-
-if test "$ssl_libraries" = "/usr/lib" || test "$ssl_libraries" = "/usr/local/lib" || test -z "$ssl_libraries" || test "$ssl_libraries" = "NONE"; then
- SSL_LDFLAGS=""
-else
- SSL_LDFLAGS="-L$ssl_libraries -R$ssl_libraries"
-fi
-
-AC_SUBST(SSL_INCLUDES)
-AC_SUBST(SSL_LDFLAGS)
-AC_SUBST(LIBSSL)
-])
-
-AC_DEFUN([KDE_CHECK_STRLCPY],
-[
-  AC_REQUIRE([AC_CHECK_STRLCAT])
-  AC_REQUIRE([AC_CHECK_STRLCPY])
-  AC_CHECK_SIZEOF(size_t)
-  AC_CHECK_SIZEOF(unsigned long)
-
-  AC_MSG_CHECKING([sizeof size_t == sizeof unsigned long])
-  AC_TRY_COMPILE(,[
-    #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
-       choke me
-    #endif
-    ],AC_MSG_RESULT([yes]),[
-      AC_MSG_RESULT(no)
-      AC_MSG_ERROR([
-       Apparently on your system our assumption sizeof size_t == sizeof unsigned long 
-       does not apply. Please mail kde-devel@kde.org with a description of your system!
-      ])
-  ])
-])
-
-AC_DEFUN([KDE_CHECK_BINUTILS],
-[
-  AC_MSG_CHECKING([if ld supports unversioned version maps])
-
-  kde_save_LDFLAGS="$LDFLAGS"
-  LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
-  echo "{ local: extern \"C++\" { foo }; };" > conftest.map
-  AC_TRY_LINK([int foo;],
-[
-#ifdef __INTEL_COMPILER
-icc apparently does not support libtools version-info and version-script
-at the same time. Dunno where the bug is, but until somebody figured out,
-better disable the optional version scripts.
-#endif
-
-  foo = 42;
-], kde_supports_versionmaps=yes, kde_supports_versionmaps=no)
-  LDFLAGS="$kde_save_LDFLAGS"
-  rm -f conftest.map
-  AM_CONDITIONAL(include_VERSION_SCRIPT, 
-    [test "$kde_supports_versionmaps" = "yes" && test "$kde_use_debug_code" = "no"])
-
-  AC_MSG_RESULT($kde_supports_versionmaps)
-])
-
-AC_DEFUN([AM_PROG_OBJC],[
-AC_CHECK_PROGS(OBJC, gcc, gcc)
-test -z "$OBJC" && AC_MSG_ERROR([no acceptable objective-c gcc found in \$PATH])
-if test "x${OBJCFLAGS-unset}" = xunset; then
-   OBJCFLAGS="-g -O2"
-fi
-AC_SUBST(OBJCFLAGS)
-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES(OBJC)])
-])
-
-AC_DEFUN([KDE_CHECK_PERL],
-[
-	KDE_FIND_PATH(perl, PERL, [$bindir $exec_prefix/bin $prefix/bin], [
-		    AC_MSG_ERROR([No Perl found in your $PATH.
-We need perl to generate some code.])
-	])
-    AC_SUBST(PERL)
-])
diff --git a/admin/am_edit b/admin/am_edit
deleted file mode 100644
index e639c0a..0000000
--- a/admin/am_edit
+++ /dev/null
@@ -1,2438 +0,0 @@
-#!/usr/bin/perl -w
-
-# Expands the specialised KDE tags in Makefile.in to (hopefully) valid
-# make syntax.
-# When called without file parameters, we work recursively on all Makefile.in
-# in and below the current subdirectory. When called with file parameters,
-# only those Makefile.in are changed.
-# The currently supported tags are
-#
-# {program}_METASOURCES
-# where you have a choice of two styles
-#   {program}_METASOURCES = name1.moc name2.moc ... [\]
-#   {program}_METASOURCES = AUTO
-#       The second style requires other tags as well.
-#
-# To install icons :
-#    KDE_ICON = iconname iconname2 ...
-#    KDE_ICON = AUTO
-#
-# For documentation :
-#    http://developer.kde.org/documentation/other/developer-faq.html
-#
-# and more new tags TBD!
-#
-# The concept (and base code) for this program came from automoc,
-# supplied by the following
-#
-# Matthias Ettrich <ettrich@kde.org>      (The originator)
-# Kalle Dalheimer <kalle@kde.org>      (The original implementator)
-# Harri Porten  <porten@tu-harburg.de>
-# Alex Zepeda  <jazepeda@pacbell.net>
-# David Faure <faure@kde.org>
-# Stephan Kulow <coolo@kde.org>
-# Dirk Mueller <mueller@kde.org>
-
-use Cwd;
-use File::Find;
-use File::Basename;
-
-# Prototype the functions
-sub initialise ();
-sub processMakefile ($);
-sub updateMakefile ();
-sub restoreMakefile ();
-
-sub removeLine ($$);
-sub appendLines ($);
-sub substituteLine ($$);
-
-sub findMocCandidates ();
-sub pruneMocCandidates ($);
-sub checkMocCandidates ();
-sub addMocRules ();
-sub findKcfgFile($);
-
-sub tag_AUTOMAKE ();
-sub tag_META_INCLUDES ();
-sub tag_METASOURCES ();
-sub tag_POFILES ();
-sub tag_DOCFILES ();
-sub tag_LOCALINSTALL();
-sub tag_IDLFILES();
-sub tag_UIFILES();
-sub tag_KCFGFILES();
-sub tag_SUBDIRS();
-sub tag_ICON();
-sub tag_CLOSURE();
-sub tag_NO_UNDEFINED();
-sub tag_NMCHECK();
-sub tag_DIST();
-sub tag_KDEINIT();
-
-# Some global globals...
-$verbose    = 0;        # a debug flag
-$thisProg   = "$0";     # This programs name
-$topdir     = cwd();    # The current directory
-@makefiles  = ();       # Contains all the files we'll process
-@foreignfiles = ();
-$start      = (times)[0]; # some stats for testing - comment out for release
-$version    = "v0.2";
-$errorflag  = 0;
-$cppExt     = "(cpp|cc|cxx|C|c\\+\\+)";
-$hExt       = "(h|H|hh|hxx|hpp|h\\+\\+)";
-$progId     = "KDE tags expanded automatically by " . basename($thisProg);
-$automkCall = "\n";
-$printname  = "";  # used to display the directory the Makefile is in
-$use_final  = 1;        # create code for --enable-final
-$cleantarget = "clean";
-$dryrun     = 0;
-$pathoption = 0;
-$foreign_libtool = 0;
-
-while (defined ($ARGV[0]))
-{
-    $_ = shift;
-    if (/^--version$/)
-    {
-        print STDOUT "\n";
-        print STDOUT basename($thisProg), " $version\n",
-                "This is really free software, unencumbered by the GPL.\n",
-                "You can do anything you like with it except sueing me.\n",
-                "Copyright 1998 Kalle Dalheimer <kalle\@kde.org>\n",
-                "Concept, design and unnecessary questions about perl\n",
-                "       by Matthias Ettrich <ettrich\@kde.org>\n\n",
-                "Making it useful by Stephan Kulow <coolo\@kde.org> and\n",
-                "Harri Porten <porten\@kde.org>\n",
-                "Updated (Feb-1999), John Birch <jb.nz\@writeme.com>\n",
-                "Fixes and Improvements by Dirk Mueller <mueller\@kde.org>\n",
-	        "Current Maintainer Stephan Kulow\n\n";
-        exit 0;
-    }
-    elsif (/^--verbose$|^-v$/)
-    {
-        $verbose = 1;       # Oh is there a problem...?
-    }
-    elsif (/^(?:-p|--path=)(.+)$/)
-    {
-        my $p = $1;
-        $thisProg = $p . "/". basename($thisProg);
-        warn ("$thisProg doesn't exist\n")      if (!(-f $thisProg));
-        $thisProg .= " -p".$p;
-        $pathoption=1;
-    }
-    elsif (/^--help$|^-h$/)
-    {
-        print STDOUT "Usage $thisProg [OPTION] ... [dir/Makefile.in]...\n",
-                "\n",
-                "Patches dir/Makefile.in generated by automake\n",
-                "(where dir can be an absolute or relative directory name)\n",
-                "\n",
-                "  -v, --verbose      verbosely list files processed\n",
-                "  -h, --help         print this help, then exit\n",
-                "  --version          print version number, then exit\n",
-                "  -p, --path=        use the path to am_edit if the path\n",
-                "                     called from is not the one to be used\n",
-	        "  --no-final         don't patch for --enable-final\n";
-	
-        exit 0;
-    }
-    elsif (/^--no-final$/)
-    {
-	$use_final = 0;
-        $thisProg .= " --no-final";
-    }
-    elsif (/^--foreign-libtool$/)
-    {
-        $foreign_libtool = 1;
-        $thisProg .= " --foreign-libtool";
-    }
-    elsif (/^-n$/)
-    {
-    	$dryrun = 1;
-    }
-    else
-    {
-        # user selects what input files to check
-        # add full path if relative path is given
-        $_ = cwd()."/".$_   if (! /^\//);
-        print "User wants $_\n" if ($verbose);
-        push (@makefiles, $_);
-    }
-}
-
-if ($thisProg =~ /^\// && !$pathoption )
-{
-  print STDERR "Illegal full pathname call performed...\n",
-      "The call to \"$thisProg\"\nwould be inserted in some Makefile.in.\n",
-      "Please use option --path.\n";
-  exit 1;
-}
-
-# Only scan for files when the user hasn't entered data
-if (!@makefiles)
-{
-    print STDOUT "Scanning for Makefile.in\n"       if ($verbose);
-    find (\&add_makefile, cwd());
-    #chdir('$topdir');
-} else {
-    print STDOUT "Using input files specified by user\n"   if ($verbose);
-}
-
-foreach $makefile (sort(@makefiles))
-{
-    processMakefile ($makefile);
-    last            if ($errorflag);
-}
-
-# Just some debug statistics - comment out for release as it uses printf.
-printf STDOUT "Time %.2f CPU sec\n", (times)[0] - $start     if ($verbose);
-
-exit $errorflag;        # causes make to fail if erroflag is set
-
-#-----------------------------------------------------------------------------
-
-# In conjunction with the "find" call, this builds the list of input files
-sub add_makefile ()
-{
-  push (@makefiles, $File::Find::name) if (/Makefile.in$/);
-}
-
-#-----------------------------------------------------------------------------
-
-# Processes a single make file
-# The parameter contains the full path name of the Makefile.in to use
-sub processMakefile ($)
-{
-    # some useful globals for the subroutines called here
-    local ($makefile)       = @_;
-    local @headerdirs       = ('.');
-    local $haveAutomocTag   = 0;
-    local $MakefileData     = "";
-
-    local $cxxsuffix  = "KKK";
-
-    local @programs = ();  # lists the names of programs and libraries
-    local $program = "";
-
-    local @kdeinits = (); # lists the kdeinit targets
-
-    local %realObjs = ();  # lists the objects compiled into $program
-    local %sources = ();   # lists the sources used for $program
-    local %finalObjs = (); # lists the objects compiled when final
-    local %realname = ();  # the binary name of program variable
-    local %idlfiles = ();  # lists the idl files used for $program
-    local %globalmocs = ();# list of all mocfiles (in %mocFiles format)
-    local %important = (); # list of files to be generated asap
-    local %uiFiles = ();
-    local %kcfgFiles = ();
-
-    local $allidls = "";
-    local $idl_output = "";# lists all idl generated files for cleantarget
-    local $ui_output = "";# lists all uic generated files for cleantarget
-    local $kcfg_output = "";# lists all kcfg generated files for cleantarget
-
-    local %dependmocs = ();
-    
-    local $metasourceTags = 0;
-    local $dep_files      = "";
-    local $dep_finals     = "";
-    local %target_adds    = (); # the targets to add
-    local %rule_adds      = ();
-    local $kdelang        = "";
-    local @cleanfiles     = ();
-    local $cleanMoc       = "";
-    local $closure_output = "";
-
-    local %varcontent     = ();
-
-    $makefileDir = dirname($makefile);
-    chdir ($makefileDir);
-    $printname = $makefile;
-    $printname =~ s/^\Q$topdir\E\///;
-    $makefile = basename($makefile);
-
-    print STDOUT "Processing makefile $printname\n"   if ($verbose);
-
-    # Setup and see if we need to do this.
-    return      if (!initialise());
-
-    tag_AUTOMAKE ();            # Allows a "make" to redo the Makefile.in
-    tag_META_INCLUDES ();       # Supplies directories for src locations
-
-    foreach $program (@programs) {
-        $sources_changed{$program} = 0;
-        $dependmocs{$program} = "";
-        $important{$program} = "";
-	tag_IDLFILES();             # Sorts out idl rules
-	tag_NO_UNDEFINED();
-	tag_CLOSURE();
-	tag_NMCHECK();
-	tag_UIFILES();              # Sorts out ui rules
-	tag_KCFGFILES();            # Sorts out kcfg rules
-        tag_METASOURCES ();         # Sorts out the moc rules
-        if ($sources_changed{$program}) {
-            my $lookup = $program . '_SOURCES\s*=[ \t]*(.*)';
-
-            if($program =~ /libkdeinit_(.*)/) {
-                my $prog = $1;
-                substituteLine($prog . '_SOURCES\s*=[ \t]*(.*)', 
-                    "${prog}_SOURCES = ${prog}_dummy.$cxxsuffix\n" .
-                    "libkdeinit_${prog}_SOURCES = " . $sources{$program});
-                $sources{$prog} = "${prog}_dummy.$cxxsuffix";
-            }
-            else {
-                substituteLine($lookup, "$program\_SOURCES=" . $sources{$program});
-            }
-        }
-        if ($important{$program}) {
-            local %source_dict = ();
-            for $source (split(/[\034\s]+/, $sources{$program})) {
-                $source_dict{$source} = 1;
-            }
-            for $source (@cleanfiles) {
-                $source_dict{$source} = 0;
-            }
-            for $source (keys %source_dict) {
-                next if (!$source);
-                if ($source_dict{$source}) {
-                    # sanity check
-                    if (! -f $source) {
-                        print STDERR "Error: $source is listed in a _SOURCE line in $printname, but doesn't exist yet. Put it in DISTCLEANFILES!\n";
-                    } else {
-                        $target_adds{"\$(srcdir)/$source"} .= $important{$program};
-                    }
-                }
-            }
-        }
-    }
-    if ($cleanMoc) {
-        # Always add dist clean tag
-        # Add extra *.moc.cpp files created for USE_AUTOMOC because they
-        # aren't included in the normal *.moc clean rules.
-        appendLines ("$cleantarget-metasources:\n\t-rm -f $cleanMoc\n");
-        $target_adds{"$cleantarget-am"} .= "$cleantarget-metasources ";
-    }
-    
-    tag_DIST() unless ($kdeopts{"noautodist"});
-
-    if ($idl_output) {
-        appendLines ("$cleantarget-idl:\n\t-rm -f $idl_output\n");
-        $target_adds{"$cleantarget-am"} .= "$cleantarget-idl ";
-    }
-
-    if ($ui_output) {
-        appendLines ("$cleantarget-ui:\n\t-rm -f $ui_output\n");
-        $target_adds{"$cleantarget-am"} .= "$cleantarget-ui ";
-    }
-
-    if ($kcfg_output) {
-        appendLines ("$cleantarget-kcfg:\n\t-rm -f $kcfg_output\n");
-        $target_adds{"$cleantarget-am"} .= "$cleantarget-kcfg ";
-    }
-
-    if ($closure_output) {
-        appendLines ("$cleantarget-closures:\n\t-rm -f $closure_output\n");
-        $target_adds{"$cleantarget-am"} .= "$cleantarget-closures ";
-    }
-
-    if ($MakefileData =~ /\nKDE_LANG\s*=\s*(\S*)\s*\n/) {
-        $kdelang = '$(KDE_LANG)'
-    } else {
-        $kdelang = '';
-    }
-
-    tag_POFILES ();             # language rules for po directory
-    tag_DOCFILES ();            # language rules for doc directories
-    tag_LOCALINSTALL();         # add $(DESTDIR) before all kde_ dirs
-    tag_ICON();
-    tag_SUBDIRS();
-
-    my $tmp = "force-reedit:\n";
-    $tmp   .= "\t$automkCall\n\tcd \$(top_srcdir) && perl $thisProg $printname\n\n";
-    appendLines($tmp);
-    
-    make_bcheck_target();
-    make_meta_classes();
-    tag_COMPILE_FIRST();
-    tag_FINAL() if (!$kdeopts{"nofinal"});
-
-    my $final_lines = "final:\n\t\$(MAKE) ";
-    my $final_install_lines = "final-install:\n\t\$(MAKE) ";
-    my $nofinal_lines = "no-final:\n\t\$(MAKE) ";
-    my $nofinal_install_lines = "no-final-install:\n\t\$(MAKE) ";
-
-    foreach $program (@programs) {
-        my $lookup = $program . '_OBJECTS\s*=[ \t]*.*';
-        my $new = "";
-        my @list = split(/[\034\s]+/, $realObjs{$program});
-        if (!$kdeopts{"nofinal"} && @list > 1 && $finalObjs{$program}) {
-            $new .= "$program\_final\_OBJECTS = " . $finalObjs{$program};
-            $new .= "\n$program\_nofinal\_OBJECTS = " . $realObjs{$program};
-            $new .= "\n\@KDE_USE_FINAL_FALSE\@$program\_OBJECTS = \$($program\_nofinal\_OBJECTS)";
-            $new .= "\n\@KDE_USE_FINAL_TRUE\@$program\_OBJECTS = \$($program\_final\_OBJECTS)";
-
-            $final_lines .= "$program\_OBJECTS=\"\$($program\_final_OBJECTS)\" ";
-            $final_install_lines .= "$program\_OBJECTS=\"\$($program\_final_OBJECTS)\" ";
-            $nofinal_lines .= "$program\_OBJECTS=\"\$($program\_nofinal\_OBJECTS)\" ";
-            $nofinal_install_lines .= "$program\_OBJECTS=\"\$($program\_nofinal_OBJECTS)\" ";
-        } else {
-            $new = "$program\_OBJECTS = " . $realObjs{$program};
-        }
-        if($MakefileData =~ m/\n$lookup/) {
-            substituteLine ($lookup, $new);
-        }
-        else {
-            appendLines("$new\n");
-        }
-    }
-    appendLines($final_lines . "all-am\n");
-    appendLines($final_install_lines . "install-am\n");
-    appendLines($nofinal_lines . "all-am\n");
-    appendLines($nofinal_install_lines . "install-am\n");
-
-    my $lookup = '(\@\S+\@)?DEP_FILES\s*=[ \t]*(.*)';
-    if ($MakefileData =~ /\n$lookup/) {
-        my $condition = $1;
-        my $depfiles = $2;
-        my $workfiles;
-
-        if ($dep_finals) {
-            # Add the conditions on every line, since
-            # there may be line continuations in the list.
-            $workfiles = "$dep_files $dep_finals $depfiles";
-            $workfiles =~ s/\034/\034$condition\@KDE_USE_FINAL_TRUE\@\t/g;
-            $lines  = "$condition\@KDE_USE_FINAL_TRUE\@DEP_FILES = $workfiles\n";
-            $workfiles = "$dep_files $depfiles";
-            $workfiles =~ s/\034/\034$condition\@KDE_USE_FINAL_FALSE\@\t/g;
-            $lines .= "$condition\@KDE_USE_FINAL_FALSE\@DEP_FILES = $workfiles";
-        } else {
-            $workfiles = "$dep_files $depfiles";
-            $workfiles =~ s/\034/\034$condition\t/g;
-            $lines = $condition . "DEP_FILES = $workfiles";
-        }
-        substituteLine($lookup, $lines);
-    }
-
-    # new recursive targets
-    $target_adds{ "nmcheck" } .= ""; # always create nmcheck target
-    $target_adds{ "nmcheck-am" } .= "nmcheck";
-    $lookup = 'RECURSIVE_TARGETS\s*=[ \t]*(.*)';
-    if ($MakefileData =~ /\n$lookup/) {
-      substituteLine($lookup, "RECURSIVE_TARGETS = $1 nmcheck-recursive bcheck-recursive");
-    }
-
-    my $cvs_lines = "cvs-clean:\n";
-    $cvs_lines .= "\t\$(MAKE) admindir=\$(top_srcdir)/admin -f \$(top_srcdir)/admin/Makefile.common cvs-clean\n";
-    appendLines($cvs_lines);
-
-    $cvs_lines  = "kde-rpo-clean:\n";
-    $cvs_lines .= "\t-rm -f *.rpo\n";
-    appendLines($cvs_lines);
-    $target_adds{"clean"} .= "kde-rpo-clean ";
-
-    my %target_dels = ("install-data-am" => "");
-
-    # some strange people like to do a install-exec, and expect that also
-    # all modules are installed.  automake doesn't know this, so we need to move
-    # this here from install-data to install-exec.
-    if ($MakefileData =~ m/\nkde_module_LTLIBRARIES\s*=/) {
-#      $target_adds{"install-exec-am"} .= "install-kde_moduleLTLIBRARIES ";
-#      don't use $target_adds here because we need to append the dependency, not
-#      prepend it. Fixes #44342 , when a module depends on a lib in the same dir
-#      and libtool needs it during relinking upon install (Simon)
-      my $lookup = "install-exec-am:([^\n]*)";
-      if($MakefileData =~ /\n$lookup\n/) {
-        substituteLine("$lookup", "install-exec-am: $1 install-kde_moduleLTLIBRARIES");
-      }
-      $target_dels{"install-data-am"} .= "install-kde_moduleLTLIBRARIES ";
-      $target_adds{"install-data-am"} .= " ";
-    }
-
-    my $lines = "";
-
-    foreach $add (keys %target_adds) {
-	my $lookup = quotemeta($add) . ':([^\n]*)';
-        if ($MakefileData =~ /\n$lookup\n/) {
-	  my $newlines = $1;
-	  my $oldlines = $lookup;
-	  if (defined $target_dels{$add}) {
-	    foreach $del (split(' ', $target_dels{$add})) {
-	      $newlines =~ s/\s*$del\s*/ /g;
-	    }
-	  }
-	  substituteLine($oldlines, "$add: " . $target_adds{$add} . $newlines);
-        } else {
-	  $lines .= "$add: " . $target_adds{$add} . "\n";
-        }
-    }
-
-    appendLines($lines) if ($lines);
-
-    $lines = join("\n", values %rule_adds);
-    appendLines($lines) if ($lines);
-
-    my $found = 1;
-
-    while ($found) {
-        if ($MakefileData =~ m/\n(.*)\$\(CXXFLAGS\)(.*)\n/) {
-            my $stuff_before = $1;
-            my $stuff_after = $2;
-            my $lookup = quotemeta("$1\$(CXXFLAGS)$2");
-            my $replacement = "$1\$(KCXXFLAGS)$2";
-            $MakefileData =~ s/$lookup/$replacement/;
-            $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
-            $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
-            substituteLine($lookup, $replacement);
-        } else {
-            $found = 0;
-        }
-    }
-
-    if($foreign_libtool == 0) {
-        $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=link) (\$\(CXXLD\).*\$\(KCXXFLAGS\))';
-
-        if ($MakefileData =~ m/$lookup/ ) {
-            $MakefileData =~ s/$lookup/$1 --tag=CXX $2/;
-        }
-
-        $lookup = '(\n[^#].*\$\(LIBTOOL\) --mode=compile)\s+(\$\(CXX\)\s+)';
-        if ($MakefileData =~ m/$lookup/ ) {
-            $MakefileData =~ s/$lookup/$1 --tag=CXX $2/;
-        }
-    }
-
-    $MakefileData =~ s/\$\(KCXXFLAGS\)/\$\(CXXFLAGS\)/g;
-
-    $lookup = '(.*)cp -pr \$\$/\$\$file \$\(distdir\)/\$\$file(.*)';
-    if ($MakefileData =~ m/\n$lookup\n/) {
-        substituteLine($lookup, "$1cp -pr \$\$d/\$\$file \$(distdir)/\$\$file$2");
-    }
-
-    # Always update the Makefile.in
-    updateMakefile ();
-    return;
-}
-
-#-----------------------------------------------------------------------------
-
-# Beware: This procedure is not complete.  E.g. it also parses lines
-# containing a '=' in rules (for instance setting shell vars).  For our
-# usage this us enough, though.
-sub read_variables ()
-{
-    while ($MakefileData =~ /\n\s*(\S+)\s*=([^\n]*)/g) {
-        $varcontent{$1} = $2;
-    }
-}
-
-# Check to see whether we should process this make file.
-# This is where we look for tags that we need to process.
-# A small amount of initialising on the tags is also done here.
-# And of course we open and/or create the needed make files.
-sub initialise ()
-{
-    if (! -r "Makefile.am") {
-	print STDOUT "found Makefile.in without Makefile.am\n" if ($verbose);
-	return 0;
-    }
-
-    # Checking for files to process...
-
-    open (FILEIN, $makefile) || die "Can't open $makefileDir/$makefile: $!\n";
-    # perl bug in 5.8.0: in utf8 mode it badly screws up
-    binmode(FILEIN, ":bytes") if ($] >= 5.008);
-    # Read the file
-    # stat(FILEIN)[7] might look more elegant, but is slower as it 
-    # requires stat'ing the file
-    seek(FILEIN, 0, 2);
-    my $fsize = tell(FILEIN);
-    seek(FILEIN, 0, 0);
-    read FILEIN, $MakefileData, $fsize;
-    close FILEIN;
-    print "DOS CRLF within $makefileDir/$makefile!\n" if($MakefileData =~ y/\r//d);
-
-    # Remove the line continuations, but keep them marked
-    # Note: we lose the trailing spaces but that's ok.
-    # Don't mangle line-leading spaces (usually tabs)
-    # since they're important.
-    $MakefileData =~ s/\\\s*\n/\034/g;
-
-    # If we've processed the file before...
-    restoreMakefile ()      if ($MakefileData =~ /$progId/);
-
-    foreach $dir (@foreignfiles) {
-      if (substr($makefileDir,0,length($dir)) eq $dir) {
-	return 0;
-      }
-    }
-
-    %kdeopts = ();
-    $kdeopts{"foreign"} = 0;
-    $kdeopts{"qtonly"} = 0;
-    $kdeopts{"noautodist"} = 0;
-    $kdeopts{"foreign-libtool"} = $foreign_libtool;
-    $kdeopts{"nofinal"} = !$use_final; # default
-
-    read_variables();
-
-    if ($MakefileData =~ /\nKDE_OPTIONS\s*=[ \t]*([^\n]*)\n/) {
-	my $kde_options_str = $1;
-        local @kde_options = split(/[\034\s]+/, $kde_options_str);
-        if (grep(/^foreign$/, @kde_options)) {
-            push(@foreignfiles, $makefileDir . "/");
-            return 0; # don't touch me
-        }
-        for $opt (@kde_options) {
-            if (!defined $kdeopts{$opt}) {
-                print STDERR "Warning: unknown option $opt in $printname\n";
-            } else {
-                $kdeopts{$opt} = 1;
-            }
-        }
-    }
-
-    # Look for the tags that mean we should process this file.
-    $metasourceTags = 0;
-    $metasourceTags++    while ($MakefileData =~ /\n[^=\#]*METASOURCES\s*=/g);
-
-    my $pofileTag = 0;
-    $pofileTag++    while ($MakefileData =~ /\nPOFILES\s*=/g);
-    if ($pofileTag > 1)
-      {
-          print STDERR "Error: Only one POFILES tag allowed\n";
-          $errorflag = 1;
-      }
-
-    while ($MakefileData =~ /\n\.SUFFIXES:([^\n]+)\n/g) {
-	my $suffixes_str = $1;
-	my @list=split(' ', $suffixes_str);
-	foreach $ext (@list) {
-	    if ($ext =~ /^\.$cppExt$/) {
-		$cxxsuffix = $ext;
-		$cxxsuffix =~ s/\.//g;
-		print STDOUT "will use suffix $cxxsuffix\n" if ($verbose);
-		last;
-	    }
-	}
-    }
-
-    tag_KDEINIT();
-
-    while ($MakefileData =~ /\n(\S*)_OBJECTS\s*=[\034 \t]*([^\n]*)\n/g) {
-
-        my $program = $1;
-        my $objs = $2; # safe them
-
-        my $ocv = 0;
-
-        my @objlist = split(/[\034\s]+/, $objs);
-        foreach $obj (@objlist) {
-            if ($obj =~ /(\S*)\$\((\S+)\)/ ) {
-		my $pre = $1;
-                my $variable = $2;
-		if ($pre eq '' && exists($varcontent{$variable})) {
-		    my @addlist = split(/[\034\s]+/, $varcontent{$variable});
-		    push(@objlist, @addlist);
-                } elsif ($variable !~ 'OBJEXT') {
-                    $ocv = 1;
-		}
-            }
-        }
-
-        next if ($ocv);
-        next if ($program =~ /^am_libkdeinit_/);
-
-        $program =~ s/^am_// if ($program =~ /^am_/);
-
-        my $sourceprogram = $program;
-        $sourceprogram =~ s/\@am_/\@/ if($sourceprogram =~ /^.*\@am_.+/);
-
-        print STDOUT "found program $program\n" if ($verbose);
-        push(@programs, $program);
-
-        $realObjs{$program} = $objs;
-
-        if ($MakefileData =~ /\n$sourceprogram\_SOURCES\s*=[ \t]*(.*)\n/) {
-            $sources{$program} = $1;
-        } 
-        else {
-            $sources{$program} = "";
-            print STDERR "found program with no _SOURCES: $program\n";
-        }
-        
-        my $realprogram = $program;
-        $realprogram =~ s/_/./g; # unmask to regexp
-        if ($MakefileData =~ /\n($realprogram)(\$\(EXEEXT\)?)?:.*\$\($program\_OBJECTS\)/) {
-            $realname{$program} = $1;
-        } else {
-            # not standard Makefile - nothing to worry about
-            $realname{$program} = "";
-        }
-    }
-
-    my $lookup = 'DEPDIR\s*=.*';
-    if ($MakefileData !~ /\n$lookup/) {
-        $lookup = 'bindir\s*=[ \t]*.*';
-        substituteLine($lookup, "DEPDIR = .deps\n$1") if ($MakefileData =~ /\n($lookup)/);
-    }
-
-    my @marks = ('MAINTAINERCLEANFILES', 'CLEANFILES', 'DISTCLEANFILES');
-    foreach $mark (@marks) {
-        while ($MakefileData =~ /\n($mark)\s*=[ \t]*([^\n]*)/g) {
-	    my $clean_str = $2; 
-            foreach $file (split('[\034\s]+', $clean_str)) {
-                $file =~ s/\.\///;
-                push(@cleanfiles, $file);
-            }
-        }
-    }
-
-    my $localTag = 0;
-    $localTag++ if ($MakefileData =~ /\ninstall-\S+-local:/);
-    
-    return (!$errorflag);
-}
-
-#-----------------------------------------------------------------------------
-
-# Gets the list of user defined directories - relative to $srcdir - where
-# header files could be located.
-sub tag_META_INCLUDES ()
-{
-    my $lookup = '[^=\n]*META_INCLUDES\s*=[ \t]*(.*)';
-    return 1    if ($MakefileData !~ /($lookup)\n/);
-    print STDOUT "META_INCLUDE processing <$1>\n"       if ($verbose);
-
-    my $headerStr = $2;
-    removeLine ($lookup, $1);
-
-    my @headerlist = split(/[\034\s]+/, $headerStr);
-
-    foreach $dir (@headerlist)
-    {
-        $dir =~ s#\$\(srcdir\)#.#;
-        if (! -d $dir)
-        {
-            print STDERR "Warning: $dir can't be found. ",
-                            "Must be a relative path to \$(srcdir)\n";
-        }
-        else
-        {
-            push (@headerdirs, $dir);
-        }
-    }
-
-    return 0;
-}
-
-#-----------------------------------------------------------------------------
-
-sub tag_FINAL()
-{
-    my @final_names = ();
-    
-    foreach $program (@programs) {
-        
-        if ($sources{$program} =~ /\(/) {
-            print STDOUT "found ( in $program\_SOURCES. skipping\n" if ($verbose);
-            next;
-        }
-
-        my $mocs = "";       # Moc files (in this program)
-	my $moc_cpp_added = 0;  # If we added some .moc.cpp files, due to
-				# no other .cpp file including the .moc one.
-        
-        my @progsources = split(/[\034\s]+/, $sources{$program});
-        my %shash = ();
-        @shash{@progsources} = 1;  # we are only interested in the existence
-        my %sourcelist = ();
-        my %extradeps = ();
-        
-        foreach $source (@progsources) {
-            my $suffix = $source;
-            $suffix =~ s/^.*\.([^\.]+)$/$1/;
-            
-            $sourcelist{$suffix} .= "$source ";
-        }
-        foreach my $mocFile (keys (%globalmocs))
-        {
-            my ($dir, $hFile, $cppFile) = split ("\035", $globalmocs{$mocFile}, 3);
-            if (defined ($cppFile)) {
-                $mocs .= " $mocFile.moc" if exists $shash{$cppFile};
-            } else {
-		$sourcelist{$cxxsuffix} .= "$mocFile.moc.$cxxsuffix ";
-		$moc_cpp_added = 1;
-	    }
-        }
-
-        # scan for extra given dependencies and add them to our target
-        while ($MakefileData =~ /\n\s*(\S+)\.(?:lo|o)\s*:([^\n]*)/g) {
-            $extradeps{$1} = $2;
-        }
-
-        foreach $suffix (keys %sourcelist) {
-            # See if this file contains c++ code. (i.e., just check the file's suffix against c++ extensions)
-            my $suffix_is_cxx = 0;
-            if($suffix =~ /($cppExt)$/) {
-              $cxxsuffix = $1;
-              $suffix_is_cxx = 1;
-            }
-            
-            my $mocfiles_in = ($suffix eq $cxxsuffix) && $moc_cpp_added;
-            
-            my @sourcelist = split(/[\034\s]+/, $sourcelist{$suffix});
-            
-            if ((@sourcelist == 1 && !$mocfiles_in) || $suffix_is_cxx != 1 ) {
-                
-                # we support IDL on our own
-                if ($suffix eq "skel" || $suffix =~ /^stub/
-		    || $suffix =~ /^signals/ # obsolete, remove in KDE-4
-                    || $suffix eq "h" || $suffix eq "ui" 
-                    || $suffix eq "kcfgc" ) {
-                    next;
-                }
-                
-                foreach $file (@sourcelist) {
-                    $file =~ s/\Q$suffix\E$//;
-                    
-                    $finalObjs{$program} .= $file;
-                    if ($program =~ /_la$/) {
-                        $finalObjs{$program} .= "lo ";
-                    } else {
-                        $finalObjs{$program} .= "o ";
-                    }
-                }
-                next; # suffix
-            }
-            
-            my $source_deps = "";
-            foreach $source (@sourcelist) {
-                if (-f $source) {
-                    $source_deps .= " \$(srcdir)/$source";
-                } else {
-                    $source_deps .= " $source";
-                }
-                my $plainsource = $source;
-                $plainsource =~ s/\.$cppExt$//;
-                $source_deps .= " " . $extradeps{$plainsource} if (exists($extradeps{$plainsource}));
-            }
-
-            $handling = "$program.all_$suffix.$suffix: \$(srcdir)/Makefile.in" . $source_deps . " " . join(' ', $mocs)  . "\n";
-            $handling .= "\t\@echo 'creating $program.all_$suffix.$suffix ...'; \\\n";
-            $handling .= "\trm -f $program.all_$suffix.files $program.all_$suffix.final; \\\n";
-            $handling .= "\techo \"#define KDE_USE_FINAL 1\" >> $program.all_$suffix.final; \\\n";
-            $handling .= "\tfor file in " . $sourcelist{$suffix} . "; do \\\n";
-            $handling .= "\t  echo \"#include \\\"\$\$file\\\"\" >> $program.all_$suffix.files; \\\n";
-            $handling .= "\t  test ! -f \$\(srcdir\)/\$\$file || egrep '^#pragma +implementation' \$\(srcdir\)/\$\$file >> $program.all_$suffix.final; \\\n";
-            $handling .= "\tdone; \\\n";
-            $handling .= "\tcat $program.all_$suffix.final $program.all_$suffix.files > $program.all_$suffix.$suffix; \\\n";
-            $handling .= "\trm -f $program.all_$suffix.final $program.all_$suffix.files\n";
-
-            appendLines($handling);
-
-            push(@final_names, "$program.all_$suffix.$suffix");
-            my $finalObj = "$program.all_$suffix.";
-            if ($program =~ /_la$/) {
-                $finalObj .= "lo";
-            } else {
-                $finalObj .= "o";
-            }
-	    $finalObjs{$program} .= $finalObj . " ";
-        }
-    }
-    
-    if (!$kdeopts{"nofinal"} && @final_names >= 1) {
-        # add clean-final target
-        my $lines = "$cleantarget-final:\n";
-        $lines .= "\t-rm -f " . join(' ', @final_names) . "\n" if (@final_names);
-        appendLines($lines);
-        $target_adds{"$cleantarget-am"} .= "$cleantarget-final ";
-        
-        foreach $finalfile (@final_names) {
-            $finalfile =~ s/\.[^.]*$/.P/;
-            $dep_finals .= " \$(DEPDIR)/$finalfile";
-        }
-    }
-}
-
-sub tag_KDEINIT()
-{
-    my @progs = ();
-    my $ltlibs = "";
-    my $lookup = 'kdeinit_LTLIBRARIES\s*=[ \t]*(.*)';
-
-    if ($MakefileData =~ m/\n$lookup/) {
-	@kdeinits = split(/[\034\s]+/, $1);
-	my $lines = "";
-	foreach my $kdeinit (@kdeinits) {
-	    if ($kdeinit =~ m/\.la$/) {
-		$kdeinit =~ s/\.la$//;
-                push(@progs, $kdeinit);
-
-                $lines .= "\n${kdeinit}.la.$cxxsuffix:\n";
-                $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${kdeinit}.la.$cxxsuffix; \\\n";
-                $lines .= "\techo 'int main(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}.la.$cxxsuffix\n";
-
-                $lines .= "\n${kdeinit}_dummy.$cxxsuffix:\n";
-                $lines .= "\techo 'extern \"C\" int kdemain(int argc, char* argv[]);' > ${kdeinit}_dummy.$cxxsuffix; \\\n";
-                $lines .= "\techo 'extern \"C\" int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> ${kdeinit}_dummy.$cxxsuffix\n";
-
-                push(@cleanfiles, "${kdeinit}.la.$cxxsuffix");
-                push(@cleanfiles, "${kdeinit}_dummy.$cxxsuffix");
-
-                # add dependency
-                $dep_files .= " \$(DEPDIR)/${kdeinit}.la.Po" if($dep_files !~/${kdeinit}.la.Po/ );
-                $dep_files .= " \$(DEPDIR)/${kdeinit}_dummy.Plo" if($dep_files !~/${kdeinit}_dummy.Plo/ );
-
-                # make library
-                $lookup = $kdeinit . '_la_LIBADD\s*=[ \t]*(.*)';
-                if($MakefileData =~ m/\n$lookup/) {
-                    my $libadd = $1;
-                    substituteLine($lookup, "${kdeinit}_la_LIBADD = libkdeinit_${kdeinit}.la");
-                    appendLines("libkdeinit_${kdeinit}_la_LIBADD = $libadd\n");
-                }
-                appendLines("libkdeinit_${kdeinit}_la_LDFLAGS = -no-undefined -avoid-version \$(all_libraries)\n");
-
-                # add library dependencies
-                $lookup = $kdeinit . '_la_DEPENDENCIES\s*=[ \t]*(.*)';
-                if($MakefileData =~ m/\n$lookup/) {
-                    my $libdeps = $1;
-                    substituteLine($lookup, "${kdeinit}_la_DEPENDENCIES = libkdeinit_${kdeinit}.la");
-                    appendLines("libkdeinit_${kdeinit}_la_DEPENDENCIES = $libdeps\n");
-                }
-
-                # make library objects
-                $lookup = "am_${kdeinit}_la_OBJECTS" . '\s*=[ \t]*(.*)';
-                if($MakefileData =~ m/\n$lookup/) {
-                    my $libobjects = $1;
-                    substituteLine($lookup, "am_${kdeinit}_la_OBJECTS = ${kdeinit}_dummy.lo");
-                    appendLines("am_libkdeinit_${kdeinit}_la_OBJECTS = $libobjects\n");
-                    my $prog = "libkdeinit_${kdeinit}_la";
-                    push(@programs, $prog);
-                    $realObjs{$prog} = $libobjects;
-                    $realname{$prog} = "libkdeinit_${kdeinit}.la";
-                }
-                $target_adds{"libkdeinit_${kdeinit}.la"} = "\$(libkdeinit_${kdeinit}_la_OBJECTS) \$(libkdeinit_${kdeinit}_la_DEPENDENCIES)\n" .
-                        "\t\$(CXXLINK) -rpath \$(libdir) \$(libkdeinit_${kdeinit}_la_LDFLAGS) ".
-                           "\$(libkdeinit_${kdeinit}_la_OBJECTS) " .
-                           "\$(libkdeinit_${kdeinit}_la_LIBADD) " .
-                           "\$(LIBS)\n";
-
-                # make libkdeinit sources
-                $lookup = $kdeinit . '_la_SOURCES\s*=[ \t]*(.*)';
-                if($MakefileData =~ m/\n$lookup/) {
-                    my $srces = $1;
-                    $sources_changed{"libkdeinit_${kdeinit}_la"} = 1;
-                    $sources{"libkdeinit_${kdeinit}_la"} = $srces;
-                }
-
-                # make libkdeinit metasources
-                $lookup = $kdeinit . '_la_METASOURCES\s*=[ \t]*(.*)';
-                substituteLine($lookup, "libkdeinit_${kdeinit}_la_METASOURCES = $1")
-                    if($MakefileData =~ m/\n$lookup/);
-
-=cut
-                # make binary sources
-                $lookup = $kdeinit. '_SOURCES\s*=[ \t]*(.*)';
-                if($MakefileData =~ m/\n$lookup/) {
-                    substituteLine($lookup, "${kdeinit}_SOURCES = ${kdeinit}.la.$cxxsuffix");
-                    $lookup = 'SOURCES\s*=[ \t]*(.*)';
-                    if($MakefileData =~ m/\n$lookup/) {
-                        my $srces = $1;
-                        $srces =~ s/\b$kdeinit\.c\b/\$(${kdeinit}_SOURCES)/;
-                        $srces =~ s/\$\(${kdeinit}_la_SOURCES\)/\$(libkdeinit_${kdeinit}_la_SOURCES)/;
-                        substituteLine($lookup, "SOURCES = $srces");
-                    }
-                    $lookup = 'DIST_SOURCES\s*=[ \t](.*)';
-                    if($MakefileData =~ m/\n$lookup/) {
-                        my $srces = $1;
-                        $srces =~ s/\b$kdeinit\.c\b/\$(${kdeinit}_SOURCES)/;
-                        $srces =~ s/\$\(${kdeinit}_la_SOURCES\)/\$(libkdeinit_${kdeinit}_la_SOURCES)/;
-                        substituteLine($lookup, "DIST_SOURCES = $srces");
-                    }
-                }
-
-                # make binary objects / libs
-                $lookup = $kdeinit . '_OBJECTS\s*=[ \t]*.*';
-                if($MakefileData =~ m/\n$lookup/) {
-                    $realObjs{$kdeinit} = "${kdeinit}.la.\$(OBJEXT)";
-                    substituteLine("${kdeinit}_LDFLAGS\\s*=.*", "${kdeinit}_LDFLAGS = \$(all_libraries)");
-                    substituteLine("${kdeinit}_LDADD\\s*=.*", "${kdeinit}_LDADD = libkdeinit_${kdeinit}.la");
-                    substituteLine("${kdeinit}_DEPENDENCIES\\s*=.*", "${kdeinit}_DEPENDENCIES = libkdeinit_${kdeinit}.la");
-                }
-=cut
-                # add binary
-                push(@programs, $kdeinit);
-                $realObjs{$kdeinit} = "${kdeinit}.la.\$(OBJEXT)";
-                $realname{$kdeinit} = $kdeinit;
-                $sources{$kdeinit} = "${kdeinit}.la.$cxxsuffix";
-
-                $lines .= "${kdeinit}_LDFLAGS = \$(KDE_RPATH) -no-undefined \$(all_libraries)\n";
-                $lines .= "${kdeinit}_LDADD = libkdeinit_${kdeinit}.la\n";
-                $lines .= "${kdeinit}_DEPENDENCIES = libkdeinit_${kdeinit}.la\n";
-
-                $target_adds{"${kdeinit}\$(EXEEXT)"} =
-                          "\$(${kdeinit}_OBJECTS) \$(${kdeinit}_DEPENDENCIES)\n" .
-                          "\t\@rm -f ${kdeinit}\$(EXEEXT)\n" .
-                          "\t\$(CXXLINK) \$(${kdeinit}_LDFLAGS) \$(${kdeinit}_OBJECTS) \$(${kdeinit}_LDADD) \$(LIBS)\n";
-
-                $ltlibs .= " libkdeinit_${kdeinit}.la";
-	    }
-        }
-        appendLines($lines);
-
-        # add libkdeinit target
-        $lookup = 'lib_LTLIBRARIES\s*=[ \t]*(.*)';
-        if($MakefileData =~ m/\n$lookup/) {
-            substituteLine($lookup, "lib_LTLIBRARIES = $1 $ltlibs");
-        }
-        else {
-            print STDERR
-                "Error: lib_LTLIBRARIES missing in $printname (required for kdeinit_LTLIBRARIES).\n";
-            $errorflag = 1;
-        }
-    }
-
-    if($#progs >= 0) {
-        if($MakefileData !~ m/\nbin_PROGRAMS\s*=/) {
-            print STDERR "Error: bin_PROGRAMS missing in $printname (required for kdeinit_LTLIBRARIES).\n";
-            $errorflag = 1;
-        }
-        else {
-            # add our new progs to SOURCES, DIST_SOURCES and bin_PROGRAMS
-            my $progsources = "";
-            my $progexes = "";
-            foreach my $p (@progs) {
-                $progsources .= "\$(${p}_SOURCES) ";
-                $progexes .= "${p}\$(EXEEXT) ";
-            }
-            $lookup = 'SOURCES\s*=[ \t]*(.*)';
-            if($MakefileData =~ /\n$lookup/) {
-                substituteLine($lookup, "SOURCES = $1 $progsources");
-            }
-            $lookup = 'DIST_SOURCES\s*=[ \t]*(.*)';
-            if($MakefileData =~ /\n$lookup/) {
-                substituteLine($lookup, "DIST_SOURCES = $1 $progsources");
-            }
-            # bin_PROGRAMS is complicated, as it exists twice, so we do a little
-            # magic trick here
-            $lookup = 'PROGRAMS\s*=[ \t]*(.*)';
-            if ($MakefileData =~ /\n$lookup/) {
-                substituteLine($lookup, "bin_PROGRAMS += $progexes\nPROGRAMS = $1");
-            }
-        }
-    }
-}
-
-#-----------------------------------------------------------------------------
-
-sub tag_COMPILE_FIRST()
-{
-  foreach $program (@programs) {
-    my $lookup = "$program" . '_COMPILE_FIRST\s*=[ \t]*(.*)';
-    if ($MakefileData =~ m/\n$lookup\n/) {
-      my $compilefirst_str = $1;
-      my @compilefirst = split(/[\034\s]+/, $compilefirst_str);
-      my @progsources = split(/[\034\s]+/, $sources{$program});
-      my %donesources = ();
-      foreach $source (@progsources) {
-        my @deps  = ();
-        my $sdeps = "";
-        if (-f $source) {
-          $sdeps = "\$(srcdir)/$source";
-        } else {
-          $sdeps = "$source";
-        }
-        foreach $depend (@compilefirst) {
-          next if ($source eq $depend);
-          # avoid cyclic dependencies
-          next if defined($donesources{$depend});
-          push @deps, $depend;
-        }
-        $target_adds{$sdeps} .= join(' ', @deps) . ' ' if (@deps);
-        $donesources{$source} = 1;
-      }
-    }
-  }
-}
-
-#-----------------------------------------------------------------------------
-
-
-# Organises the list of headers that we'll use to produce moc files
-# from.
-sub tag_METASOURCES ()
-{
-    local @newObs           = ();  # here we add to create object files
-    local @depend           = ();  # here we add to create moc files
-    local $mocExt           = ".moc";
-    local %mocFiles         = ();
-
-    my $line = "";
-    my $postEqual = "";
-
-    my $lookup;
-    my $found = "";
-    if ($metasourceTags > 1) {
-	$lookup = $program . '_METASOURCES\s*=\s*(.*)';
-	return 1    if ($MakefileData !~ /\n($lookup)\n/);
-	$found = $1;
-    } else {
-	$lookup = $program . '_METASOURCES\s*=\s*(.*)';
-	if ($MakefileData !~ /\n($lookup)\n/) {
-	    $lookup = 'METASOURCES\s*=\s*(.*)';
-	    return 1    if ($MakefileData !~ /\n($lookup)\n/);
-	    $found = $1;
-	    $metasourceTags = 0; # we can use the general target only once
-	} else {
-            $found = $1;
-        }
-    }
-    print STDOUT "METASOURCE processing <$found>)\n"      if ($verbose);
-    
-    $postEqual = $found;
-    $postEqual =~ s/[^=]*=//;
-    
-    removeLine ($lookup, $found);
-    
-    # Always find the header files that could be used to "moc"
-    return 1    if (findMocCandidates ());
-    
-    if ($postEqual =~ /AUTO\s*(\S*)|USE_AUTOMOC\s*(\S*)/)
-    {
-	print STDERR "$printname: the argument for AUTO|USE_AUTOMOC is obsolete" if ($+);
-	$mocExt = ".moc.$cxxsuffix";
-	$haveAutomocTag = 1;
-    }
-    else
-    {
-        # Not automoc so read the list of files supplied which
-        # should be .moc files.
-
-        $postEqual =~ tr/\034/ /;
-
-        # prune out extra headers - This also checks to make sure that
-        # the list is valid.
-        pruneMocCandidates ($postEqual);
-    }
-
-    checkMocCandidates ();
-    
-    if (@newObs) {
-        my $ext =  ($program =~ /_la$/) ? ".moc.lo " : ".moc.o ";
-        $realObjs{$program} .= "\034" . join ($ext, @newObs) . $ext;
-        $dependmocs{$program} = join (".moc.$cxxsuffix " , @newObs) . ".moc.$cxxsuffix";
-        foreach $file (@newObs) {
-            $dep_files .= " \$(DEPDIR)/$file.moc.P" if($dep_files !~/$file.moc.P/);
-        }
-    }
-    if (@depend) {
-        $dependmocs{$program} .= " ";
-        $dependmocs{$program} .= join('.moc ', @depend) . ".moc";
-        $dependmocs{$program} .= " ";
-    }
-    addMocRules ();
-    @globalmocs{keys %mocFiles}=values %mocFiles;
-}
-
-#-----------------------------------------------------------------------------
-
-# Returns 0 if the line was processed - 1 otherwise.
-# Errors are logged in the global $errorflags
-sub tag_AUTOMAKE ()
-{
-    my $lookup = '.*cd \$\(top_srcdir\)\s+&&[\034\s]+\$\(AUTOMAKE\)(.*)';
-    return 1    if ($MakefileData !~ /\n($lookup)\n/);
-    print STDOUT "AUTOMAKE processing <$1>\n"        if ($verbose);
-
-    my $newLine = $1."\n\tcd \$(top_srcdir) && perl $thisProg $printname";
-    substituteLine ($lookup, $newLine);
-    $automkCall = $1;
-
-    $lookup = '.*cd \$\(srcdir\)\s+&&[\034\s]+\$\(AUTOCONF\)(.*)';
-    if ($MakefileData =~ /\n($lookup)\n/) {
-      $newLine  = "\tcd \$(srcdir) && rm -f configure\n";
-      $newLine .= "\tcd \$(top_srcdir) && \$(MAKE) -f admin/Makefile.common configure";
-      substituteLine ($lookup, $newLine);
-    }
-
-    return 0;
-}
-
-#-----------------------------------------------------------------------------
-
-sub handle_TOPLEVEL()
-{
-    my $pofiles = "";
-    my @restfiles = ();
-    opendir (THISDIR, ".");
-    foreach $entry (readdir(THISDIR)) {
-        next if (-d $entry);
-        
-        next if ($entry eq "CVS" || $entry =~ /^\./  || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/ || $entry =~ /.gmo$/);
-                 
-        if ($entry =~ /\.po$/) {
-             next;
-        }
-        push(@restfiles, $entry);
-    }
-    closedir (THISDIR);
-            
-    if (@restfiles) {
-        $target_adds{"install-data-am"} .= "install-nls-files ";
-        $lines = "install-nls-files:\n";
-        $lines .= "\t\$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/$kdelang\n";
-        for $file (@restfiles) {
-            $lines .= "\t\$(INSTALL_DATA) \$\(srcdir\)/$file \$(DESTDIR)\$(kde_locale)/$kdelang/$file\n";
-        }
-	$target_adds{"uninstall"} .= "uninstall-nls-files ";
-        $lines .= "uninstall-nls-files:\n";
-        for $file (@restfiles) {
-            $lines .= "\t-rm -f \$(DESTDIR)\$(kde_locale)/$kdelang/$file\n";
-        }
-        appendLines($lines);
-    }
-    
-    return 0;
-}
-
-#-----------------------------------------------------------------------------
-
-sub tag_SUBDIRS ()
-{
-  if ($MakefileData !~ /\nSUBDIRS\s*=\s*\$\(AUTODIRS\)\s*\n/) {
-    return 1;
-  }
-
-  my $subdirs = ".";
-
-  opendir (THISDIR, ".");
-  foreach $entry (readdir(THISDIR)) {
-    next if ($entry eq "CVS" || $entry =~ /^\./);
-    if (-d $entry && -f $entry . "/Makefile.am") {
-      $subdirs .= " $entry";
-      next;
-    }
-  }
-  closedir (THISDIR);
-
-  substituteLine('SUBDIRS\s*=.*', "SUBDIRS =$subdirs");
-  return 0;
-}
-
-sub tag_IDLFILES ()
-{
-    my @psources = split(/[\034\s]+/, $sources{$program});
-    my $dep_lines = "";
-    my @cppFiles = ();
-    
-    foreach $source (@psources) {
-        my $skel = ($source =~ m/\.skel$/);
-        my $stub = ($source =~ m/\.stub$/);
-        my $signals = ($source =~ m/\.signals$/); # obsolete, remove in KDE-4
-        
-        if ($stub || $skel || $signals) {
-
-            my $qs = quotemeta($source);
-            $sources{$program} =~ s/$qs//;
-            $sources_changed{$program} = 1;
-
-            $source =~ s/\.(stub|skel|signals)$//;
-            my $sourcename;
-
-            if ($skel) {
-                $sourcename = "$source\_skel";
-            } elsif ($stub) {
-                $sourcename = "$source\_stub";
-            } else {
-                $sourcename = "$source\_signals";
-            }
-            
-            my $sourcedir = '';
-            if (-f "$makefileDir/$source.h") {
-                $sourcedir = '$(srcdir)/';
-            } else {
-                if ($MakefileData =~ /\n$source\_DIR\s*=\s*(\S+)\n/) {
-                    $sourcedir = $1;
-                    $sourcedir .= "/" if ($sourcedir !~ /\/$/);
-                }
-            }
-            
-            if ($allidls !~ /$source\_kidl/) {
-                
-                $use_ng = ($MakefileData =~ /\n$source\_DCOPIDLNG\s*=\s*(\S+)\n/);
-                $dcopidl =  $use_ng ? "\$(DCOPIDLNG)" : "\$(DCOPIDL)";
-
-                $dep_lines .= "$source.kidl: $sourcedir$source.h \$(DCOP_DEPENDENCIES)\n";
-                $dep_lines .= "\t$dcopidl $sourcedir$source.h > $source.kidl || ( rm -f $source.kidl ; false )\n";
-                
-                $allidls .= $source . "_kidl ";
-            }
-            
-            if ($allidls !~ /$sourcename/) {
-                
-                $dep_lines_tmp = "";
-
-                if ($skel) {
-                    $dep_lines .= "$sourcename.$cxxsuffix: $source.kidl\n";
-                    $dep_lines .= "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-stub $source.kidl\n";
-                } elsif ($stub) {
-                    $dep_lines_tmp = "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-signals --no-skel $source.kidl\n";
-                } else { # signals - obsolete, remove in KDE 4
-                    $dep_lines_tmp = "\t\$(DCOPIDL2CPP) --c++-suffix $cxxsuffix --no-stub --no-skel $source.kidl\n";
-                }
-
-                if ($stub || $signals) {
-                    $target_adds{"$sourcename.$cxxsuffix"} .= "$sourcename.h ";
-                    $dep_lines .= "$sourcename.h: $source.kidl\n";
-                    $dep_lines .= $dep_lines_tmp;
-                }
-                
-                $allidls .= $sourcename . " ";
-            }
-            
-            $idlfiles{$program} .= $sourcename . " ";
-            
-            if ($program =~ /_la$/) {
-                $realObjs{$program} .= " $sourcename.lo";
-            } else {
-                $realObjs{$program} .= " $sourcename.\$(OBJEXT)";
-            }
-            $sources{$program} .= " $sourcename.$cxxsuffix";
-            $sources_changed{$program} = 1;
-            $important{$program} .= "$sourcename.h " if (!$skel);
-            $idl_output .= "\\\n\t$sourcename.$cxxsuffix $sourcename.h $source.kidl ";
-            push(@cleanfiles, "$sourcename.$cxxsuffix");
-            push(@cleanfiles, "$sourcename.h");
-            push(@cleanfiles, "$sourcename.kidl");
-            $dep_files .= " \$(DEPDIR)/$sourcename.P" if ($dep_files !~/$sourcename.P/);
-        }
-    }
-    if ($dep_lines) {
-        appendLines($dep_lines);
-    }
-    
-    if (0) {
-        my $lookup = "($program)";
-        $lookup .= '(|\$\(EXEEXT\))';
-        $lookup =~ s/\_/./g;
-        $lookup .= ":(.*..$program\_OBJECTS..*)";
-        #    $lookup = quotemeta($lookup);
-        if ($MakefileData =~ /\n$lookup\n/) {
-            
-            my $line = "$1$2: ";
-            foreach $file (split(' ', $idlfiles{$program})) {
-                $line .= "$file.$cxxsuffix ";
-            }
-            $line .= $3;
-            substituteLine($lookup, $line);
-        } else {
-            print STDERR "no built dependency found $lookup\n";
-        }
-    }
-}
-
-sub tag_UIFILES ()
-{
-    my @psources = split(/[\034\s]+/, $sources{$program});
-    my @depFiles = ();
-    
-    foreach $source (@psources) {
-
-        if ($source =~ m/\.ui$/) {
-
-            print STDERR "adding UI file $source\n" if ($verbose);
-
-            my $qs = quotemeta($source);
-            $sources{$program} =~ s/$qs//;
-            $sources_changed{$program} = 1;
-      
-            $source =~ s/\.ui$//;
-
-            my $sourcedir = '';
-            if (-f "$makefileDir/$source.ui") {
-                $sourcedir = '$(srcdir)/';
-            }
-
-            if (!$uiFiles{$source}) {
-
-                my $dep_lines = "$source.$cxxsuffix: $sourcedir$source.ui $source.h $source.moc\n";
-                $dep_lines .= "\trm -f $source.$cxxsuffix\n";
-                if (!$kdeopts{"qtonly"}) {
-                    $dep_lines .= "\techo '#include <klocale.h>' > $source.$cxxsuffix\n";
-                    my ($mangled_source) = $source;
-                    $mangled_source =~ s/[^A-Za-z0-9]/_/g;  # get rid of garbage
-                    $dep_lines .= "\t\$(UIC) -tr \${UIC_TR} -i $source.h $sourcedir$source.ui > $source.$cxxsuffix.temp ; ret=\$\$?; \\\n";
-                    $dep_lines .= "\t\$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\" ),QString::null,g\" $source.$cxxsuffix.temp | \$(PERL) -pe \"s,\${UIC_TR}( \\\"\\\"\\, \\\"\\\" ),QString::null,g\" | \$(PERL) -pe \"s,image([0-9][0-9]*)_data,img\\\$\$1_" . $mangled_source . ",g\" >> $source.$cxxsuffix ;\\\n";
-		    $dep_lines .= "\trm -f $source.$cxxsuffix.temp ;\\\n";
-                } else {
-                    $dep_lines .= "\t\$(UIC) -i $source.h $sourcedir$source.ui > $source.$cxxsuffix; ret=\$\$?; \\\n";
-                }
-		$dep_lines .= "\tif test \"\$\$ret\" = 0; then echo '#include \"$source.moc\"' >> $source.$cxxsuffix; else rm -f $source.$cxxsuffix ; exit \$\$ret ; fi\n\n";
-                $dep_lines .= "$source.h: $sourcedir$source.ui\n";
-                $dep_lines .= "\t\$(UIC) -o $source.h $sourcedir$source.ui\n\n";
-                $dep_lines .= "$source.moc: $source.h\n";
-                $dep_lines .= "\t\$(MOC) $source.h -o $source.moc\n";
-
-                $rule_adds{"$source.$cxxsuffix"} = $dep_lines;
-
-		$uiFiles{$source} = 1;
-                $dependmocs{$program} .= " $source.moc";
-                $globalmocs{$source} = "\035$source.h\035$source.cpp";
-            }
-            
-            if ($program =~ /_la$/) {
-                $realObjs{$program} .= " $source.lo";
-            } else {
-                $realObjs{$program} .= " $source.\$(OBJEXT)";
-            }
-            $sources{$program} .= " $source.$cxxsuffix";
-            $sources_changed{$program} = 1;
-            $important{$program} .= "$source.h ";
-            $ui_output .= "\\\n\t$source.$cxxsuffix $source.h $source.moc ";
-            push(@cleanfiles, "$source.$cxxsuffix");
-            push(@cleanfiles, "$source.h");
-            push(@cleanfiles, "$source.moc");
-            $dep_files .= " \$(DEPDIR)/$source.P" if($dep_files !~/$source.P/ );
-        }
-    }
-}
-
-sub tag_KCFGFILES ()
-{
-    my @psources = split(/[\034\s]+/, $sources{$program});
-    my @depFiles = ();
-    
-    foreach $source (@psources) {
-
-        if ($source =~ m/\.kcfgc$/) {
-
-            print STDERR "adding KCFG file $source\n" if ($verbose);
-
-            my $qs = quotemeta($source);
-            $sources{$program} =~ s/$qs//;
-            $sources_changed{$program} = 1;
-      
-            $source =~ s/\.kcfgc$//;
-
-            my $sourcedir = '';
-            if (-f "$makefileDir/$source.kcfgc") {
-                $sourcedir = '$(srcdir)/';
-            }
-
-            if (!$kcfgFiles{$source}) {
-                $kcfg = "$program.kcfg";
-                findKcfgFile("$source.kcfgc");
-
-                my $fixsuffix = "";
-                $fixsuffix = "else mv $source.cpp $source.$cxxsuffix ; " 
-                    unless "cpp" eq $cxxsuffix;
-
-                my $dep_lines = "$source.$cxxsuffix: $source.h\n";
-                $dep_lines .= "$source.h: $sourcedir$kcfg $sourcedir$source.kcfgc \$(KCFG_DEPENDENCIES)\n";
-                $dep_lines .= "\t\$(KCONFIG_COMPILER) $sourcedir$kcfg $sourcedir$source.kcfgc; ret=\$\$?; \\\n";
-		$dep_lines .= "\tif test \"\$\$ret\" != 0; then rm -f $source.h ; exit \$\$ret ; $fixsuffix fi\n\n";
-
-                $rule_adds{"$source.$cxxsuffix"} = $dep_lines;
-
-		$kcfgFiles{$source} = 1;
-            }
-            
-            if ($program =~ /_la$/) {
-                $realObjs{$program} .= " $source.lo";
-            } else {
-                $realObjs{$program} .= " $source.\$(OBJEXT)";
-            }
-            $sources{$program} .= " $source.$cxxsuffix";
-            $sources_changed{$program} = 1;
-            $important{$program} .= "$source.h ";
-            $kcfg_output .= "\\\n\t$source.$cxxsuffix $source.h ";
-            push(@cleanfiles, "$source.$cxxsuffix");
-            push(@cleanfiles, "$source.h");
-            $dep_files .= " \$(DEPDIR)/$source.P" if($dep_files !~/$source.P/ );
-        }
-    }
-}
-
-sub tag_ICON()
-{
-    my $lookup = '([^\s]*)_ICON\s*=[ \t]*(.*)';
-    my $install = "";
-    my $uninstall = "";
-
-    while ($MakefileData =~ /\n$lookup/g) {
-        my $destdir;
-        if ($1 eq "KDE") {
-            $destdir = "kde_icondir";
-        } else {
-            $destdir = $1 . "dir";
-        }
-        my $iconauto = ($2 =~ /AUTO\s*$/);
-        my @appnames = ();
-        if ( ! $iconauto ) {
-	    my $appicon_str = $2;
-            my @_appnames = split(" ", $appicon_str);
-            print STDOUT "KDE_ICON processing <@_appnames>\n"   if ($verbose);
-            foreach $appname (@_appnames) {
-                push(@appnames, quotemeta($appname));
-            }
-        } else {
-            print STDOUT "KDE_ICON processing <AUTO>\n"   if ($verbose);
-        }
-
-        my @files = ();
-        opendir (THISDIR, ".");
-        foreach $entry (readdir(THISDIR)) {
-            next if ($entry eq "CVS" || $entry =~ /^\./  || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/);
-            next if (! -f $entry);
-            if ( $iconauto )
-              {
-                  push(@files, $entry)
-                    if ($entry =~ /\.xpm/ || $entry =~ /\.png/ || $entry =~ /\.mng/ || $entry =~ /\.svg/);
-              } else {
-                  foreach $appname (@appnames) {
-                      push(@files, $entry)
-                        if ($entry =~ /-$appname\.xpm/ || $entry =~ /-$appname\.png/ || $entry =~ /-$appname\.mng/ || $entry =~ /-$appname\.svg/);
-                  }
-              }
-        }
-        closedir (THISDIR);
-        
-        my %directories = ();
-        
-        foreach $file (@files) {
-            my $newfile = $file;
-            my $prefix = $file;
-            $prefix =~ s/\.(png|xpm|mng|svg|svgz)$//;
-            my $appname = $prefix;
-            $appname =~ s/^[^-]+-// if ($appname =~ /-/) ;
-            $appname =~ s/^[^-]+-// if ($appname =~ /-/) ;
-            $appname = quotemeta($appname);
-            $prefix =~ s/$appname$//;
-            $prefix =~ s/-$//;
-            
-            $prefix = 'lo16-app' if ($prefix eq 'mini');
-            $prefix = 'lo32-app' if ($prefix eq 'lo');
-            $prefix = 'hi48-app' if ($prefix eq 'large');
-            $prefix .= '-app' if ($prefix =~ m/^...$/);
-            
-            my $type = $prefix;
-            $type =~ s/^.*-([^-]+)$/$1/;
-            $prefix =~ s/^(.*)-[^-]+$/$1/;
-            
-            my %type_hash =
-              (
-               'action' => 'actions',
-               'app' => 'apps',
-               'device' => 'devices',
-               'filesys' => 'filesystems',
-               'mime' => 'mimetypes'
-              );
-
-            if (! defined $type_hash{$type} ) {
-                print STDERR "unknown icon type $type in $printname ($file)\n";
-                next;
-            }
-
-            my %dir_hash =
-              (
-               'los' => 'locolor/16x16',
-               'lom' => 'locolor/32x32',
-               'him' => 'hicolor/32x32',
-               'hil' => 'hicolor/48x48',
-               'lo16' => 'locolor/16x16',
-               'lo22' => 'locolor/22x22',
-               'lo32' => 'locolor/32x32',
-               'hi16' => 'hicolor/16x16',
-               'hi22' => 'hicolor/22x22',
-               'hi32' => 'hicolor/32x32',
-               'hi48' => 'hicolor/48x48',
-               'hi64' => 'hicolor/64x64',
-               'hi128' => 'hicolor/128x128',
-               'hisc' => 'hicolor/scalable',
- 	       'cr16' => 'crystalsvg/16x16',
-               'cr22' => 'crystalsvg/22x22',
-               'cr32' => 'crystalsvg/32x32',
-               'cr48' => 'crystalsvg/48x48',
-               'cr64' => 'crystalsvg/64x64',
-               'cr128' => 'crystalsvg/128x128',
-               'crsc' => 'crystalsvg/scalable'
-              );
-            
-            $newfile =~ s@.*-($appname\.(png|xpm|mng|svgz|svg?))@$1@;
-            
-            if (! defined $dir_hash{$prefix}) {
-                print STDERR "unknown icon prefix $prefix in $printname\n";
-                next;
-            }
-            
-            my $dir = $dir_hash{$prefix} . "/" . $type_hash{$type};
-            if ($newfile =~ /-[^\.]/) {
-                my $tmp = $newfile;
-                $tmp =~ s/^([^-]+)-.*$/$1/;
-                $dir = $dir . "/" . $tmp;
-                $newfile =~ s/^[^-]+-//;
-            }
-            
-            if (!defined $directories{$dir}) {
-                $install .= "\t\$(mkinstalldirs) \$(DESTDIR)\$($destdir)/$dir\n";
-                $directories{$dir} = 1;
-            }
-            
-            $install .= "\t\$(INSTALL_DATA) \$(srcdir)/$file \$(DESTDIR)\$($destdir)/$dir/$newfile\n";
-            $uninstall .= "\t-rm -f \$(DESTDIR)\$($destdir)/$dir/$newfile\n";
-            
-        }
-    }
-
-    if (length($install)) {
-        $target_adds{"install-data-am"} .= "install-kde-icons ";
-        $target_adds{"uninstall-am"} .= "uninstall-kde-icons ";
-        appendLines("install-kde-icons:\n" . $install . "\nuninstall-kde-icons:\n" . $uninstall);
-    }
-}
-
-sub handle_POFILES($$)
-{
-  my @pofiles = split(" ", $_[0]);
-  my $lang = $_[1];
-
-  # Build rules for creating the gmo files
-  my $tmp = "";
-  my $allgmofiles     = "";
-  my $pofileLine   = "POFILES =";
-  foreach $pofile (@pofiles)
-    {
-        $pofile =~ /(.*)\.[^\.]*$/;          # Find name minus extension
-        $tmp .= "$1.gmo: $pofile\n";
-        $tmp .= "\trm -f $1.gmo; \$(GMSGFMT) -o $1.gmo \$(srcdir)/$pofile\n";
-        $tmp .= "\ttest ! -f $1.gmo || touch $1.gmo\n";
-        $allgmofiles .= " $1.gmo";
-        $pofileLine  .= " $1.po";
-    }
-  appendLines ($tmp);
-  my $lookup = 'POFILES\s*=([^\n]*)';
-  if ($MakefileData !~ /\n$lookup/) {
-    appendLines("$pofileLine\nGMOFILES =$allgmofiles");
-  } else {
-    substituteLine ($lookup, "$pofileLine\nGMOFILES =$allgmofiles");
-  }
-
-    if ($allgmofiles) {
-
-        # Add the "clean" rule so that the maintainer-clean does something
-        appendLines ("clean-nls:\n\t-rm -f $allgmofiles\n");
-
-	$target_adds{"maintainer-clean"} .= "clean-nls ";
-
-	$lookup = 'DISTFILES\s*=[ \t]*(.*)';
-	if ($MakefileData =~ /\n$lookup/) {
-	  $tmp = "DISTFILES = \$(GMOFILES) \$(POFILES) $1";
-	  substituteLine ($lookup, $tmp);
-	}
-    }
-
-  $target_adds{"install-data-am"} .= "install-nls ";
-
-  $tmp = "install-nls:\n";
-  if ($lang) {
-    $tmp  .= "\t\$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES\n";
-  }
-  $tmp .= "\t\@for base in ";
-  foreach $pofile (@pofiles)
-    {
-      $pofile =~ /(.*)\.[^\.]*$/;          # Find name minus extension
-      $tmp .= "$1 ";
-    }
-
-  $tmp .= "; do \\\n";
-  if ($lang) {
-    $tmp .= "\t  echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n";
-    $tmp .= "\t  if test -f \$\$base.gmo; then \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n";
-    $tmp .= "\t  elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n";
-    $tmp .= "\t  fi ;\\\n";
-  } else {
-    $tmp .= "\t  echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
-    $tmp .= "\t  \$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES ; \\\n";
-    $tmp .= "\t  if test -f \$\$base.gmo; then \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
-    $tmp .= "\t  elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
-    $tmp .= "\t  fi ;\\\n";
-  }
-  $tmp .= "\tdone\n\n";
-  appendLines ($tmp);
-
-  $target_adds{"uninstall"} .= "uninstall-nls ";
-
-  $tmp = "uninstall-nls:\n";
-  foreach $pofile (@pofiles)
-    {
-      $pofile =~ /(.*)\.[^\.]*$/;          # Find name minus extension
-      if ($lang) {
-	$tmp .= "\trm -f \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/$1.mo\n";
-      } else {
-	$tmp .= "\trm -f \$(DESTDIR)\$(kde_locale)/$1/LC_MESSAGES/\$(PACKAGE).mo\n";
-      }
-    }
-  appendLines($tmp);
-
-  $target_adds{"all"} .= "all-nls ";
-
-  $tmp = "all-nls: \$(GMOFILES)\n";
-
-  appendLines($tmp);
-
-  $target_adds{"distdir"} .= "distdir-nls ";
-
-  $tmp = "distdir-nls:\$(GMOFILES)\n";
-  $tmp .= "\tfor file in \$(POFILES); do \\\n";
-  $tmp .= "\t  cp \$(srcdir)/\$\$file \$(distdir); \\\n";
-  $tmp .= "\tdone\n";
-  $tmp .= "\tfor file in \$(GMOFILES); do \\\n";
-  $tmp .= "\t  cp \$(srcdir)/\$\$file \$(distdir); \\\n";
-  $tmp .= "\tdone\n";
-
-  appendLines ($tmp);
-
-  if (!$lang) {
-    appendLines("merge:\n\t\$(MAKE) -f \$(top_srcdir)/admin/Makefile.common package-merge POFILES=\"\${POFILES}\" PACKAGE=\${PACKAGE}\n\n");
-  }
- 
-}
-
-#-----------------------------------------------------------------------------
-
-# Returns 0 if the line was processed - 1 otherwise.
-# Errors are logged in the global $errorflags
-sub tag_POFILES ()
-{
-    my $lookup = 'POFILES\s*=([^\n]*)';
-    return 1    if ($MakefileData !~ /\n$lookup/);
-    print STDOUT "POFILES processing <$1>\n"   if ($verbose);
-
-    my $tmp = $1;
-
-    # make sure these are all gone.
-    if ($MakefileData =~ /\n\.po\.gmo:\n/)
-    {
-        print STDERR "Warning: Found old .po.gmo rules in $printname. New po rules not added\n";
-        return 1;
-    }
-
-    # Either find the pofiles in the directory (AUTO) or use
-    # only the specified po files.
-    my $pofiles = "";
-    if ($tmp =~ /^\s*AUTO\s*$/)
-    {
-        opendir (THISDIR, ".");
-	$pofiles =  join(" ", grep(/\.po$/, readdir(THISDIR)));
-        closedir (THISDIR);
-        print STDOUT "pofiles found = $pofiles\n"   if ($verbose);
-	if (-f "charset" && -f "kdelibs/kdelibs.po") {
-	    handle_TOPLEVEL();
-	}
-    }
-    else
-    {
-        $tmp =~ s/\034/ /g;
-        $pofiles = $tmp;
-    }
-    return 1    if (!$pofiles);        # Nothing to do
-
-    handle_POFILES($pofiles, $kdelang);
-
-    return 0;
-}
-
-sub helper_LOCALINSTALL($)
-{
-  my $lookup = "\035" . $_[0] . " *:[^\035]*\035\t";
-  my $copy = $MakefileData;
-  $copy =~ s/\n/\035/g;
-  if ($copy =~ /($lookup.*)$/) {
-
-    $install = $1;
-    $install =~ s/\035$_[0] *:[^\035]*\035//;
-    my $emptyline = 0;
-    while (! $emptyline ) {
-      if ($install =~ /([^\035]*)\035(.*)/) {
-	local $line = $1;
-	$install = $2;
-	if ($line !~ /^\s*$/ && $line !~ /^(\@.*\@)*\t/) {
-	  $emptyline = 1;
-	} else {
-	  replaceDestDir($line);
-	}
-      } else {
-	$emptyline = 1;
-      }
-    }
-  }
-
-}
-
-sub tag_LOCALINSTALL ()
-{
-  helper_LOCALINSTALL('install-exec-local');
-  helper_LOCALINSTALL('install-data-local');
-  helper_LOCALINSTALL('uninstall-local');
-
-  return 0;
-}
-
-sub replaceDestDir($) {
-  local $line = $_[0];
-
-  if (   $line =~ /^\s*(\@.*\@)*\s*\$\(mkinstalldirs\)/
-      || $line =~ /^\s*(\@.*\@)*\s*\$\(INSTALL\S*\)/
-      || $line =~ /^\s*(\@.*\@)*\s*(-?rm.*) \S*$/)
-  {
-    $line =~ s/^(.*) ([^\s]+)\s*$/$1 \$(DESTDIR)$2/ if ($line !~ /\$\(DESTDIR\)/);
-  }
-
-  if ($line ne $_[0]) {
-    $_[0] = quotemeta $_[0];
-    substituteLine($_[0], $line);
-  }
-}
-
-#---------------------------------------------------------------------------
-# libtool is very hard to persuade it could use -Wl,--no-undefined for making
-# -no-undefined actually work
-# append $(KDE_NO_UNFINED) after every -no-undefined in LDFLAGS
-# this may go away if libtool ever does this on its own
-sub tag_NO_UNDEFINED () {
-    return if ($program !~ /_la$/);
-
-    my $lookup = quotemeta($realname{$program}) . ":.*?\n\t.*?\\((.*?)\\) .*\n";
-    $MakefileData =~ m/$lookup/;
-    return if (!defined($1));
-    return if ($1 !~ /CXXLINK/);
-
-    if ($MakefileData !~ /\n$program\_LDFLAGS\s*=.*-no-undefined/ ) {
-        return;
-    }
-
-    $lookup = $program . '\_LDFLAGS(\s*)=(.*)-no-undefined(.*)';
-    if ($MakefileData =~ /\n$lookup\n/) {
-	my $replace = $program . "\_LDFLAGS$1=$2-no-undefined \$(KDE_NO_UNDEFINED)$3";
-        substituteLine($lookup, $replace);
-    }
-}
-
-sub tag_CLOSURE () {
-    return if ($program !~ /_la$/);
-
-    my $lookup = quotemeta($realname{$program}) . ":.*?\n\t.*?\\((.*?)\\) .*\n";
-    $MakefileData =~ m/$lookup/;
-    return if (!defined($1));
-    return if ($1 !~ /CXXLINK/);
-
-    if ($MakefileData !~ /\n$program\_LDFLAGS\s*=.*-no-undefined/ &&
-        $MakefileData !~ /\n$program\_LDFLAGS\s*=.*KDE_PLUGIN/ ) {
-        print STDERR "Report: $program contains undefined in $printname\n" if ($program =~ /^lib/ && $dryrun);
-        return;
-    }
-
-    my $closure = $realname{$program} . ".closure";
-    my $lines = "$closure: \$($program\_OBJECTS) \$($program\_DEPENDENCIES)\n";
-    $lines .= "\t\@echo \"int main() {return 0;}\" > $program\_closure.$cxxsuffix\n";
-    $lines .= "\t\@\$\(LTCXXCOMPILE\) -c $program\_closure.$cxxsuffix\n";
-    $lines .= "\t\$\(CXXLINK\) $program\_closure.lo \$($program\_LDFLAGS) \$($program\_OBJECTS) \$($program\_LIBADD) \$(LIBS)\n";
-    $lines .= "\t\@rm -f $program\_closure.* $closure\n";
-    $lines .= "\t\@echo \"timestamp\" > $closure\n";
-    $lines .= "\n";
-    appendLines($lines);
-    $lookup = $realname{$program} . ": (.*)";
-    if ($MakefileData =~ /\n$lookup\n/) {
-        $lines  = "\@KDE_USE_CLOSURE_TRUE@". $realname{$program} . ": $closure $1";
-        $lines .= "\n\@KDE_USE_CLOSURE_FALSE@" . $realname{$program} . ": $1";
-        substituteLine($lookup, $lines);
-    }
-    $closure_output .= " $closure";
-}
-
-sub tag_NMCHECK () {
-    return if ($program !~ /_la$/);
-    my $lookup = quotemeta($realname{$program}) . ":.*?\n\t.*?\\((.*?)\\) .*\n";
-    $MakefileData =~ m/$lookup/;
-    my $linkcmd = $1;
-    return if (!defined($1));
-    return if ($linkcmd !~ /CXXLINK/ && $linkcmd !~ /LINK/);
-
-    $lookup = $program . '_NMCHECK\s*=([^\n]*)';
-    if( $MakefileData !~ m/\n$lookup\n/ ) {
-	return;
-    }
-    my $allowed = $1;
-    $allowed =~ s/^ *//;
-    $lookup = $program . '_NMCHECKWEAK\s*=([^\n]*)';
-    my $weak = "";
-    my $is_weak = 0;
-    if( $MakefileData =~ m/\n$lookup\n/ ) {
-	$weak = $1;
-	$is_weak = 1;
-    }
-    $weak =~ s/^ *//;
-
-    if( $is_weak )
-    {
-	$weak = '--allowweak=\'' . $weak . '\' ';
-    }
-    my $nmline = "\@KDE_USE_NMCHECK_TRUE@\t\@\$(MAKE) \$(AM_MAKEFLAGS) nmcheck_$realname{$program} || ( rm -f $realname{$program}; exit 1 )";
-    $lookup = '(\t\$\(CXXLINK\)[^\n]*' . $program . '_OBJECTS[^\n]*)';
-    if( $MakefileData =~ /\n$lookup\n/ ) {
-	my $oldstuff = $1;
-	substituteLine( $lookup, $oldstuff . "\n" . $nmline );
-    }
-    $lookup = '(\t\$\(LINK\)[^\n]*' . $program . '_OBJECTS[^\n]*)';
-    if( $MakefileData =~ /\n$lookup\n/ ) {
-	my $oldstuff = $1;
-	substituteLine( $lookup, $oldstuff . "\n" . $nmline );
-    }
-    $nmline = "\@\$(top_srcdir)/admin/nmcheck $realname{$program} \'$allowed\' $weak";
-    appendLines( "\nnmcheck_$realname{$program}: $realname{$program} \n\t$nmline\n" );
-    $target_adds{ "nmcheck" } .= "nmcheck_$realname{$program} ";
-}
-
-sub tag_DIST () {
-    my %foundfiles = ();
-    opendir (THISDIR, ".");
-    foreach $entry (readdir(THISDIR)) {
-        next if ($entry eq "CVS" || $entry =~ /^\./  || $entry eq "Makefile" || $entry =~ /~$/ || $entry =~ /^\#.*\#$/);
-        next if (! -f $entry);
-        next if ($entry =~ /\.moc/ || $entry =~ /\.moc.$cppExt$/ || $entry =~ /\.lo$/ || $entry =~ /\.la$/ || $entry =~ /\.o/);
-        next if ($entry =~ /\.all_$cppExt\.$cppExt$/);
-        $foundfiles{$entry} = 1;
-    }
-    closedir (THISDIR);
-
-    # doing this for MAINTAINERCLEANFILES would be wrong
-    my @marks = ("EXTRA_DIST", "DIST_COMMON", '\S*_SOURCES', '\S*_HEADERS', 'CLEANFILES', 'DISTCLEANFILES', '\S*_OBJECTS');
-    foreach $mark (@marks) {
-        while ($MakefileData =~ /\n($mark)\s*=[ \t]*([^\n]*)/g) {
-	    my $cleanfiles_str = $2;
-            foreach $file (split('[\034\s]+', $cleanfiles_str)) {
-                $file =~ s/\.\///;
-                $foundfiles{$file} = 0 if (defined $foundfiles{$file});
-            }
-        }
-    }
-    my @files = ("Makefile", "config.cache", "config.log", "stamp-h",
-                 "stamp-h1", "stamp-h1", "config.h", "Makefile", 
-                 "config.status", "config.h", "libtool", "core" );
-    foreach $file (@files) {
-        $foundfiles{$file} = 0 if (defined $foundfiles{$file});
-    }
-
-    my $KDE_DIST = "";
-    foreach $file (keys %foundfiles) {
-        if ($foundfiles{$file} == 1) {
-            $KDE_DIST .= "$file ";
-        }
-    }
-    if ($KDE_DIST) {
-        print "KDE_DIST $printname $KDE_DIST\n" if ($verbose);
-
-        my $lookup = 'DISTFILES\s*=[ \t]*(.*)';
-        if ($MakefileData =~ /\n$lookup/) {
-            substituteLine($lookup, "DISTFILES = $1 \$(KDE_DIST)");
-            appendLines("KDE_DIST=$KDE_DIST\n");
-        }
-    }
-}
-
-#-----------------------------------------------------------------------------
-# Returns 0 if the line was processed - 1 otherwise.
-# Errors are logged in the global $errorflags
-sub tag_DOCFILES ()
-{
-    $target_adds{"all"} .= "docs-am ";
-
-    my $lookup = 'KDE_DOCS\s*=[ \t]*([^\n]*)';
-    goto nodocs    if ($MakefileData !~ /\n$lookup/);
-    print STDOUT "KDE_DOCS processing <$1>\n"   if ($verbose);
-
-    my $tmp = $1;
-
-    # Either find the files in the directory (AUTO) or use
-    # only the specified po files.
-    my $files = "";
-    my $appname = $tmp;
-    $appname =~ s/^(\S*)\s*.*$/$1/;
-    if ($appname =~ /AUTO/) {
-      $appname = basename($makefileDir);
-      if ("$appname" eq "en") {
-      	  print STDERR "Error: KDE_DOCS = AUTO relies on the directory name. Yours is 'en' - you most likely want something else, e.g. KDE_DOCS = myapp\n";
-          exit(1);
-      }
-    }
-
-    if ($tmp !~ / - /)
-    {
-        opendir (THISDIR, ".");
-	foreach $entry (readdir(THISDIR)) {
-	  next if ($entry eq "CVS" || $entry =~ /^\./  || $entry =~ /^Makefile/ || $entry =~ /~$/ || $entry =~ /^\#.*\#$/ || $entry eq "core" || $entry eq "index.cache.bz2");
-	  next if (! -f $entry);
-	  $files .= "$entry ";
-	}
-        closedir (THISDIR);
-        print STDOUT "docfiles found = $files\n"   if ($verbose);
-    }
-    else
-    {
-        $tmp =~ s/\034/ /g;
-	$tmp =~ s/^\S*\s*-\s*//;
-        $files = $tmp;
-    }
-    goto nodocs if (!$files);        # Nothing to do
-
-    if ($files =~ /(^| )index\.docbook($| )/) {
-
-      my $lines = "";
-      my $lookup = 'MEINPROC\s*=';
-      if ($MakefileData !~ /\n($lookup)/) {
-	$lines = "MEINPROC=/\$(kde_bindir)/meinproc\n";
-      }
-      $lookup = 'KDE_XSL_STYLESHEET\s*=';
-      if ($MakefileData !~ /\n($lookup)/) {
-        $lines .= "KDE_XSL_STYLESHEET=/\$(kde_datadir)/ksgmltools2/customization/kde-chunk.xsl\n";
-      }
-      $lookup = '\nindex.cache.bz2:';
-      if ($MakefileData !~ /\n($lookup)/) {
-         $lines .= "index.cache.bz2: \$(srcdir)/index.docbook \$(KDE_XSL_STYLESHEET) $files\n";
-         $lines .= "\t\@if test -n \"\$(MEINPROC)\"; then echo \$(MEINPROC) --check --cache index.cache.bz2 \$(srcdir)/index.docbook; \$(MEINPROC) --check --cache index.cache.bz2 \$(srcdir)/index.docbook; fi\n";
-         $lines .= "\n";
-      }
-
-      $lines .= "docs-am: index.cache.bz2\n";
-      $lines .= "\n";
-      $lines .= "install-docs: docs-am install-nls\n";
-      $lines .= "\t\$(mkinstalldirs) \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname\n";
-      $lines .= "\t\@if test -f index.cache.bz2; then \\\n";
-      $lines .= "\techo \$(INSTALL_DATA) index.cache.bz2 \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/; \\\n";
-      $lines .= "\t\$(INSTALL_DATA) index.cache.bz2 \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/; \\\n";
-      $lines .= "\telif test -f  \$(srcdir)/index.cache.bz2; then \\\n";
-      $lines .= "\techo \$(INSTALL_DATA) \$(srcdir)/index.cache.bz2 \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/; \\\n";
-      $lines .= "\t\$(INSTALL_DATA) \$(srcdir)/index.cache.bz2 \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/; \\\n";
-      $lines .= "\tfi\n";
-      $lines .= "\t-rm -f \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
-      $lines .= "\t\$(LN_S) \$(kde_libs_htmldir)/$kdelang/common \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/common\n";
-
-      $lines .= "\n";
-      $lines .= "uninstall-docs:\n";
-      $lines .= "\t-rm -rf \$(kde_htmldir)/$kdelang/$appname\n";
-      $lines .= "\n";
-      $lines .= "clean-docs:\n";
-      $lines .= "\t-rm -f index.cache.bz2\n";
-      $lines .= "\n";
-      $target_adds{"install-data-am"} .= "install-docs ";
-      $target_adds{"uninstall"} .= "uninstall-docs ";
-      $target_adds{"clean-am"} .= "clean-docs ";
-      appendLines ($lines);
-    } else {
-      appendLines("docs-am: $files\n");
-    }
-
-    $target_adds{"install-data-am"} .= "install-nls ";
-    $target_adds{"uninstall"} .= "uninstall-nls ";
-
-    $tmp = "install-nls:\n";
-    $tmp .= "\t\$(mkinstalldirs) \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname\n";
-    $tmp .= "\t\@for base in $files; do \\\n";
-    $tmp .= "\t  echo \$(INSTALL_DATA) \$\$base \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/\$\$base ;\\\n";
-    $tmp .= "\t  \$(INSTALL_DATA) \$(srcdir)/\$\$base \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/\$\$base ;\\\n";
-    $tmp .= "\tdone\n";
-    if ($appname eq 'common') {
-      $tmp .= "\t\@echo \"merging common and language specific dir\" ;\\\n";
-      $tmp .= "\tif test ! -f \$(kde_htmldir)/en/common/kde-common.css; then echo 'no english docs found in \$(kde_htmldir)/en/common/'; exit 1; fi \n";
-      $tmp .= "\t\@com_files=`cd \$(kde_htmldir)/en/common && echo *` ;\\\n";
-      $tmp .= "\tcd \$(DESTDIR)\$(kde_htmldir)/$kdelang/common ;\\\n";
-      $tmp .= "\tif test -n \"\$\$com_files\"; then for p in \$\$com_files ; do \\\n";
-      $tmp .= "\t  case \" $files \" in \\\n";
-      $tmp .= "\t    *\" \$\$p \"*) ;; \\\n";
-      $tmp .= "\t    *) test ! -f \$\$p && echo \$(LN_S) ../../en/common/\$\$p \$(DESTDIR)\$(kde_htmldir)/$kdelang/common/\$\$p && \$(LN_S) ../../en/common/\$\$p \$\$p ;; \\\n";
-      $tmp .= "\t  esac ; \\\n";
-      $tmp .= "\tdone ; fi ; true\n";
-    }
-    $tmp .= "\n";
-    $tmp .= "uninstall-nls:\n";
-    $tmp .= "\tfor base in $files; do \\\n";
-    $tmp .= "\t  rm -f \$(DESTDIR)\$(kde_htmldir)/$kdelang/$appname/\$\$base ;\\\n";
-    $tmp .= "\tdone\n\n";
-    appendLines ($tmp);
-
-    $target_adds{"distdir"} .= "distdir-nls ";
-
-    $tmp = "distdir-nls:\n";
-    $tmp .= "\tfor file in $files; do \\\n";
-    $tmp .= "\t  cp \$(srcdir)/\$\$file \$(distdir); \\\n";
-    $tmp .= "\tdone\n";
-
-    appendLines ($tmp);
-
-    return 0;
-
-  nodocs:
-    appendLines("docs-am:\n");
-    return 1;
-}
-
-#-----------------------------------------------------------------------------
-# Find headers in any of the source directories specified previously, that
-# are candidates for "moc-ing".
-sub findMocCandidates ()
-{
-    foreach $dir (@headerdirs)
-    {
-        my @list = ();
-        opendir (SRCDIR, "$dir");
-        @hFiles = grep { /.+\.$hExt$/o && !/^\./ } readdir(SRCDIR);
-        closedir SRCDIR;
-        foreach $hf (@hFiles)
-        {
-            next if ($hf =~ /^\.\#/);
-	    $hf =~ /(.*)\.[^\.]*$/;          # Find name minus extension
-	    next if ($uiFiles{$1});
-            open (HFIN, "$dir/$hf") || die "Could not open $dir/$hf: $!\n";
-            my $hfsize = 0;
-            seek(HFIN, 0, 2);
-            $hfsize = tell(HFIN);
-            seek(HFIN, 0, 0);
-            read HFIN, $hfData, $hfsize;
-            close HFIN;
-            # push (@list, $hf) if(index($hfData, "Q_OBJECT") >= 0); ### fast but doesn't handle //Q_OBJECT
-	    # handle " { friend class blah; Q_OBJECT ", but don't match antlarr_Q_OBJECT (\b).
-            if ( $hfData =~ /{([^}]*)\bQ_OBJECT/s ) {
-                push (@list, $hf) unless $1 =~ m://[^\n]*Q_OBJECT[^\n]*$:s;  ## reject "// Q_OBJECT"
-            }
-        }
-        # The assoc array of root of headerfile and header filename
-        foreach $hFile (@list)
-        {
-            $hFile =~ /(.*)\.[^\.]*$/;          # Find name minus extension
-            if ($mocFiles{$1})
-            {
-              print STDERR "Warning: Multiple header files found for $1\n";
-              next;                           # Use the first one
-            }
-            $mocFiles{$1} = "$dir\035$hFile";   # Add relative dir
-        }
-    }
-
-    return 0;
-}
-
-#-----------------------------------------------------------------------------
-
-# The programmer has specified a moc list. Prune out the moc candidates
-# list that we found based on looking at the header files. This generates
-# a warning if the programmer gets the list wrong, but this doesn't have
-# to be fatal here.
-sub pruneMocCandidates ($)
-{
-    my %prunedMoc = ();
-    local @mocList = split(' ', $_[0]);
-
-    foreach $mocname (@mocList)
-    {
-        $mocname =~ s/\.moc$//;
-        if ($mocFiles{$mocname})
-        {
-            $prunedMoc{$mocname} = $mocFiles{$mocname};
-        }
-        else
-        {
-            my $print = $makefileDir;
-            $print =~ s/^\Q$topdir\E\\//;
-            # They specified a moc file but we can't find a header that
-            # will generate this moc file. That's possible fatal!
-            print STDERR "Warning: No moc-able header file for $print/$mocname\n";
-        }
-    }
-
-    undef %mocFiles;
-    %mocFiles = %prunedMoc;
-}
-
-#-----------------------------------------------------------------------------
-
-# Finds the cpp files (If they exist).
-# The cpp files get appended to the header file separated by \035
-sub checkMocCandidates ()
-{
-    my @cppFiles;
-    my $cpp2moc;  # which c++ file includes which .moc files
-    my $moc2cpp;  # which moc file is included by which c++ files
-
-    return unless (keys %mocFiles);
-    opendir(THISDIR, ".") || return;
-    @cppFiles = grep { /.+\.$cppExt$/o  && !/.+\.moc\.$cppExt$/o
-                         && !/.+\.all_$cppExt\.$cppExt$/o
-			 && !/^\./  } readdir(THISDIR);
-    closedir THISDIR;
-    return unless (@cppFiles);
-    my $files = join (" ", @cppFiles);
-    $cpp2moc = {};
-    $moc2cpp = {};
-    foreach $cxxf (@cppFiles)
-    {
-      open (CXXFIN, $cxxf) || die "Could not open $cxxf: $!\n";
-      seek(CXXFIN, 0, 2);
-      my $cxxfsize = tell(CXXFIN);
-      seek(CXXFIN, 0, 0);
-      read CXXFIN, $cxxfData, $cxxfsize;
-      close CXXFIN;
-      while(($cxxfData =~ m/^[ \t]*\#include\s*[<\"](.*\.moc)[>\"]/gm)) {
-	$cpp2moc->{$cxxf}->{$1} = 1;
-	$moc2cpp->{$1}->{$cxxf} = 1;
-      }
-    }
-    foreach my $mocFile (keys (%mocFiles))
-    {
-	@cppFiles = keys %{$moc2cpp->{"$mocFile.moc"}};
-        if (@cppFiles == 1) {
-            $mocFiles{$mocFile} .= "\035" . $cppFiles[0];
-	    push(@depend, $mocFile);
-        } elsif (@cppFiles == 0) {
-            push (@newObs, $mocFile);           # Produce new object file
-            next    if ($haveAutomocTag);       # This is expected...
-            # But this is an error we can deal with - let them know
-            print STDERR
-                "Warning: No c++ file that includes $mocFile.moc\n";
-        } else {
-            # We can't decide which file to use, so it's fatal. Although as a
-            # guess we could use the mocFile.cpp file if it's in the list???
-            print STDERR
-                "Error: Multiple c++ files that include $mocFile.moc\n";
-            print STDERR "\t",join ("\t", @cppFiles),"\n";
-            $errorflag = 1;
-            delete $mocFiles{$mocFile};
-            # Let's continue and see what happens - They have been told!
-        }
-    }
-}
-
-#-----------------------------------------------------------------------------
-
-# Add the rules for generating moc source from header files
-# For Automoc output *.moc.cpp but normally we'll output *.moc
-# (We must compile *.moc.cpp separately. *.moc files are included
-# in the appropriate *.cpp file by the programmer)
-sub addMocRules ()
-{
-    my $cppFile;
-    my $hFile;
-
-    foreach $mocFile (keys (%mocFiles))
-    {
-        undef $cppFile;
-        ($dir, $hFile, $cppFile) =  split ("\035", $mocFiles{$mocFile}, 3);
-        $dir =~ s#^\.#\$(srcdir)#;
-        if (defined ($cppFile))
-        {
-	  $cppFile =~ s,\.[^.]*$,,;
-	  $target_adds{"$cppFile.o"} .= "$mocFile.moc ";
-	  $target_adds{"$cppFile.lo"} .= "$mocFile.moc ";
-	  appendLines ("$mocFile.moc: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile.moc\n");
-	  $cleanMoc .= " $mocFile.moc";
-	  appendLines ("mocs: $mocFile.moc\n");
-        }
-        else
-        {
-            appendLines ("$mocFile$mocExt: $dir/$hFile\n\t\$(MOC) $dir/$hFile -o $mocFile$mocExt\n");
-            $cleanMoc .= " $mocFile$mocExt";
-	    appendLines ("mocs: $mocFile$mocExt\n");
-        }
-    }
-}
-
-sub make_bcheck_target()
-{
-    my $lookup = 'RECURSIVE_TARGETS\s*=[ \t]*(.*)';
-    my $bcheckdep = "bcheck-am";
-    $bcheckdep = "bcheck-recursive" if ($MakefileData =~ /\n$lookup/);
-
-    my $headers= "";
-    $headers = $1 if($MakefileData =~ /\nHEADERS\s*=[ \t]*(.+)/);
-    $headers =~ s/\$\((?:noinst|EXTRA)_HEADERS\)//g;
-
-    $target_adds{"clean-am"} .= "clean-bcheck ";
-
-    my $t = "clean-bcheck: \n" .
-            "\trm -f *.bchecktest.cc *.bchecktest.cc.class a.out\n\n" .
-            "bcheck: $bcheckdep\n\n" .
-            "bcheck-am:\n" .
-           "\t\@for i in $headers; do \\\n" .
-           "\t    if test \$(srcdir)/\$\$i -nt \$\$i.bchecktest.cc; then \\\n" . 
-           "\t        echo \"int main() {return 0;}\" > \$\$i.bchecktest.cc ; \\\n" .
-           "\t        echo \"#include \\\"\$\$i\\\"\" >> \$\$i.bchecktest.cc ; \\\n" .
-           "\t        echo \"\$\$i\"; \\\n" . 
-           "\t        if ! ";
-    $t .=  $cxxsuffix eq "KKK" ?
-           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
-           "\$(CXXCOMPILE) ";
-    $t .=  " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
-           "\t            rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
-           "\t        fi ; \\\n" .
-           "\t        echo \"\" >> \$\$i.bchecktest.cc.class; \\\n" .
-           "\t        perl \$(top_srcdir)/admin/bcheck.pl \$\$i.bchecktest.cc.class || { rm -f \$\$i.bchecktest.cc; exit 1; }; \\\n" .
-           "\t        rm -f a.out; \\\n" .
-           "\t    fi ; \\\n" .
-           "\tdone\n";
-    appendLines("$t\n");
-}
-
-sub make_meta_classes ()
-{
-    return if ($kdeopts{"qtonly"});
-
-    my $cppFile;
-    my $hFile;
-    my $moc_class_headers = "";
-    foreach $program (@programs) {
-	my $mocs = "";
-	my @progsources = split(/[\034\s]+/, $sources{$program});
-	my @depmocs = split(' ', $dependmocs{$program});
-	my %shash = (), %mhash = ();
-	@shash{@progsources} = 1;  # we are only interested in the existence
-	@mhash{@depmocs} = 1;
-
-	print STDOUT "program=$program\n" if ($verbose);
-	print STDOUT "psources=[".join(' ', keys %shash)."]\n" if ($verbose);
-	print STDOUT "depmocs=[".join(' ', keys %mhash)."]\n" if ($verbose);
-	print STDOUT "globalmocs=[".join(' ', keys(%globalmocs))."]\n" if ($verbose);
-	foreach my $mocFile (keys (%globalmocs))
-	{
-	    my ($dir, $hFile, $cppFile) = split ("\035", $globalmocs{$mocFile}, 3);
-	    if (defined ($cppFile))
-	    {
-		$mocs .= " $mocFile.moc" if exists $shash{$cppFile};
-	    }
-	    else
-	    {
-		# Bah. This is the case, if no C++ file includes the .moc
-		# file. We make a .moc.cpp file for that. Unfortunately this
-		# is not included in the %sources hash, but rather is mentioned
-		# in %dependmocs. If the user wants to use AUTO he can't just
-		# use an unspecific METAINCLUDES. Instead he must use
-		# program_METAINCLUDES. Anyway, it's not working real nicely.
-		# E.g. Its not clear what happens if user specifies two
-		# METAINCLUDES=AUTO in the same Makefile.am.
-		$mocs .= " $mocFile.moc.$cxxsuffix"
-		    if exists $mhash{$mocFile.".moc.$cxxsuffix"};
-	    }
-	}
-	if ($mocs) {
-	    print STDOUT "==> mocs=[".$mocs."]\n" if ($verbose);
-	}
-	print STDOUT "\n" if $verbose;
-    }
-    if ($moc_class_headers) {
-        appendLines ("$cleantarget-moc-classes:\n\t-rm -f $moc_class_headers\n");
-        $target_adds{"$cleantarget-am"} .= "$cleantarget-moc-classes ";
-    }
-}
-
-#-----------------------------------------------------------------------------
-
-sub updateMakefile ()
-{
-    return if ($dryrun);
-
-    open (FILEOUT, "> $makefile")
-                        || die "Could not create $makefile: $!\n";
-
-    $MakefileData =~ s/\034/\\\n/g;    # Restore continuation lines
-    # Append our $progId line, _below_ the "generated by automake" line
-    # because automake-1.6 relies on the first line to be his own.
-    my $progIdLine = "\# $progId - " . '$Revision: 1.22 $ '."\n";
-    if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
-        warn "automake line not found in $makefile\n";
-	# Fallback: first line
-        print FILEOUT $progIdLine;
-    };
-    print FILEOUT $MakefileData;
-    close FILEOUT;
-}
-
-#-----------------------------------------------------------------------------
-
-# The given line needs to be removed from the makefile
-# Do this by adding the special "removed line" comment at the line start.
-sub removeLine ($$)
-{
-    my ($lookup, $old) = @_;
-
-    $old =~ s/\034/\\\n#>- /g;          # Fix continuation lines
-    $MakefileData =~ s/\n$lookup/\n#>\- $old/;
-}
-
-#-----------------------------------------------------------------------------
-
-# Replaces the old line with the new line
-# old line(s) are retained but tagged as removed. The new line(s) have the
-# "added" tag placed before it.
-sub substituteLine ($$)
-{
-    my ($lookup, $new) = @_;
-
-    if ($MakefileData =~ /\n($lookup)/) {
-      $old = $1;
-      $old =~ s/\034/\\\n#>\- /g;         # Fix continuation lines
-      my $newCount = ($new =~ tr/\034//) + ($new =~ tr/\n//) + 1;
-      $new =~ s/\\\n/\034/g;
-      $MakefileData =~ s/\n$lookup/\n#>- $old\n#>\+ $newCount\n$new/;
-    } else {
-        warn "Warning: substitution of \"$lookup\" in $printname failed\n";
-    }
-}
-
-#-----------------------------------------------------------------------------
-
-# Slap new lines on the back of the file.
-sub appendLines ($)
-{
-  my ($new) = @_;
-  my $copynew = $new;
-  my $newCount = ($new =~ tr/\034//) + ($new =~ tr/\n//) + 1;
-  $new =~ s/\\\n/\034/g;        # Fix continuation lines
-  $MakefileData .= "\n#>\+ $newCount\n$new";
-}
-
-#-----------------------------------------------------------------------------
-
-# Restore the Makefile.in to the state it was before we fiddled with it
-sub restoreMakefile ()
-{
-    $MakefileData =~ s/# $progId[^\n\034]*[\n\034]*//g;
-    # Restore removed lines
-    $MakefileData =~ s/([\n\034])#>\- /$1/g;
-    # Remove added lines
-    while ($MakefileData =~ /[\n\034]#>\+ ([^\n\034]*)/)
-    {
-        my $newCount = $1;
-        my $removeLines = "";
-        while ($newCount--) {
-            $removeLines .= "[^\n\034]*([\n\034]|)";
-        }
-        $MakefileData =~ s/[\n\034]#>\+.*[\n\034]$removeLines/\n/;
-    }
-}
-
-#-----------------------------------------------------------------------------
-
-# find the .kcfg file listed in the .kcfgc file
-sub findKcfgFile($)
-{
-  my ($kcfgf) = @_;
-  open (KCFGFIN, $kcfgf) || die "Could not open $kcfgf: $!\n";
-  seek(KCFGFIN, 0, 2);
-  my $kcfgfsize = tell(KCFGFIN);
-  seek(KCFGFIN, 0, 0);
-  read KCFGFIN, $kcfgfData, $kcfgfsize;
-  close KCFGFIN;
-  if(($kcfgfData =~ m/^File=(.*\.kcfg)/gm)) {
-    $kcfg = $1;
-  }
-}
diff --git a/admin/compile b/admin/compile
deleted file mode 100755
index 9bb997a..0000000
--- a/admin/compile
+++ /dev/null
@@ -1,99 +0,0 @@
-#! /bin/sh
-
-# Wrapper for compilers which do not understand `-c -o'.
-
-# Copyright 1999, 2000 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, 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.
-
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
-
-prog=$1
-shift
-
-ofile=
-cfile=
-args=
-while test $# -gt 0; do
-   case "$1" in
-    -o)
-       # configure might choose to run compile as `compile cc -o foo foo.c'.
-       # So we do something ugly here.
-       ofile=$2
-       shift
-       case "$ofile" in
-	*.o | *.obj)
-	   ;;
-	*)
-	   args="$args -o $ofile"
-	   ofile=
-	   ;;
-       esac
-       ;;
-    *.c)
-       cfile=$1
-       args="$args $1"
-       ;;
-    *)
-       args="$args $1"
-       ;;
-   esac
-   shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-   # If no `-o' option was seen then we might have been invoked from a
-   # pattern rule where we don't need one.  That is ok -- this is a
-   # normal compilation that the losing compiler can handle.  If no
-   # `.c' file was seen then we are probably linking.  That is also
-   # ok.
-   exec "$prog" $args
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
-while true; do
-   if mkdir $lockdir > /dev/null 2>&1; then
-      break
-   fi
-   sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
-
-# Run the compile.
-"$prog" $args
-status=$?
-
-if test -f "$cofile"; then
-   mv "$cofile" "$ofile"
-fi
-
-rmdir $lockdir
-exit $status
diff --git a/admin/conf.change.pl b/admin/conf.change.pl
deleted file mode 100644
index 645b820..0000000
--- a/admin/conf.change.pl
+++ /dev/null
@@ -1,191 +0,0 @@
-#!/usr/bin/env perl
-
-# this script patches a config.status file, to use our own perl script
-# in the main loop
-# we do it this way to circumvent hacking (and thereby including)
-# autoconf function (which are GPL) into our LGPL acinclude.m4.in
-# written by Michael Matz <matz@kde.org>
-# adapted by Dirk Mueller <mueller@kde.org>
-#
-#   This file 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; see the file COPYING.LIB.  If not, write to
-#   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#   Boston, MA 02111-1307, USA.
-
-# we have to change two places
-# 1. the splitting of the substitutions into chunks of 90 (or even 48 in
-#    later autoconf's
-# 2. the big main loop which patches all Makefile.in's
-
-use strict;
-use File::Basename;
-
-my $ac_aux_dir = dirname($0);
-my ($flag);
-my $ac_version = 0;
-my $vpath_seen = 0;
-$flag = 0;
-
-while (<>) {
-# usage of $flag: 0 -- we have seen nothing yet
-#   1 -- we are in (1)
-#   2 -- we have ended (1)
-#   3 -- we are in (2)
-#   4 -- we ended (2)
-
-    if ($flag == 4) {
-        print;
-    } elsif ($flag == 0) {
-# 1. begins with (including): "ac_max_sed_\S+\s*=\s*[0-9]+..."
-#    ends with (excluding) "CONFIG_FILE=..."
-#    in later autoconf (2.14.1) there is no CONFIG_FILES= line,
-#    but instead the (2) directly follow (1)
-        if (/^\s*ac_max_sed_([a-z]+).*=\s*([0-9]+)/ ) {
-	    $flag = 1;
-	    if ($1 eq 'lines') {
-                # lets hope its different with 2141, 
-                # wasn't able to verify that
-              if ($2 eq '48') {
-                $ac_version = 250;
-              }
-              else {
-	        $ac_version = 2141;
-              }
-	    } elsif ($1 eq 'cmds') {
-	        $ac_version = 213;
-	    }
-	    # hmm, we don't know the autoconf version, but we try anyway
-	} else {
-	    print;
-	}
-    } elsif ($flag == 1) {
-        if (/^\s*CONFIG_FILES=/ && ($ac_version != 250)) {
-	     print;
-	     $flag = 2;
-	} elsif (/^\s*for\s+ac_file\s+in\s+.*CONFIG_FILES/ ) {
-	     $flag = 3;
-	}
-    } elsif ($flag == 2) {
-# 2. begins with: "for ac_file in.*CONFIG_FILES"  (the next 'for' after (1))
-#    end with: "rm -f conftest.s\*"
-# on autoconf 250, it ends with '# CONFIG_HEADER section'
-#
-# gg: if a post-processing commands section is found first, 
-#    stop there and insert a new loop to honour the case/esac.
-# (pattern: /^\s+#\sRun the commands associated with the file./)
-
-	if (/^\s*for\s+ac_file\s+in\s+.*CONFIG_FILES/ ) {
-	    $flag = 3;
-	} else {
-	    print;
-	}
-    } elsif ($flag == 3) {
-        if (/^\s*rm\s+-f\s+conftest/ ) {
-	    $flag = 4;
-	    &insert_main_loop();
-	} elsif (/^\s*rm\s+-f\s+.*ac_cs_root/ ) {
-	    $flag = 4;
-	    &insert_main_loop();
-	    #die "hhhhhhh";
-	    if ($ac_version != 2141) {
-	        print STDERR "hmm, don't know autoconf version\n";
-	    }
-        } elsif (/^\#\s*CONFIG_(HEADER|COMMANDS) section.*|^\s+#\s(Run) the commands associated/) {
-          $flag = 4;
-          my $commands = defined $2;
-          &insert_main_loop();
-          $commands && insert_command_loop();
-          if($ac_version != 250) {
-            print STDERR "hmm, something went wrong :-(\n";
-          }
-	} elsif (/VPATH/ ) {
-	    $vpath_seen = 1;
-	}
-    }
-}
-
-die "wrong input (flag != 4)" unless $flag == 4;
-print STDERR "hmm, don't know autoconf version\n" unless $ac_version;
-
-sub insert_main_loop {
-
-  if ($ac_version == 250) {
-    &insert_main_loop_250();
-  }
-  else {
-    &insert_main_loop_213();
-  }
-}
-
-sub insert_main_loop_250 {
-
-  print <<EOF;
-  #echo Doing the fast build of Makefiles -- autoconf $ac_version
-EOF
-    if ($vpath_seen) {
-        print <<EOF;
-        # VPATH subst was seen in original config.status main loop
-  echo '/^[ 	]*VPATH[ 	]*=[^:]*\$/d' >>\$tmp/subs.sed
-EOF
-      }
-  print <<EOF;
-  rm -f \$tmp/subs.files
-  for ac_file in .. \$CONFIG_FILES ; do
-      if test "x\$ac_file" != x..; then
-          echo \$ac_file >> \$tmp/subs.files
-      fi
-  done
-  if test -f \$tmp/subs.files ; then
-      perl $ac_aux_dir/config.pl "\$tmp/subs.sed" "\$tmp/subs.files" "\$srcdir" "\$INSTALL"
-  fi
-  rm -f \$tmp/subs.files
-
-fi
-EOF
-  return;
-}
-
-sub insert_main_loop_213 {
-    print <<EOF;
-#echo Doing the fast build of Makefiles -- autoconf $ac_version
-if test "x\$ac_cs_root" = "x" ; then
-    ac_cs_root=conftest
-fi
-EOF
-    if ($vpath_seen) {
-      print <<EOF;
-# VPATH subst was seen in original config.status main loop
-echo '/^[ 	]*VPATH[ 	]*=[^:]*\$/d' >> \$ac_cs_root.subs
-EOF
-    }
-    print <<EOF;
-rm -f \$ac_cs_root.sacfiles
-for ac_file in .. \$CONFIG_FILES ; do
-    if test "x\$ac_file" != x..; then
-        echo \$ac_file >> \$ac_cs_root.sacfiles
-    fi
-done
-if test -f \$ac_cs_root.sacfiles ; then
-    perl $ac_aux_dir/config.pl "\$ac_cs_root.subs" "\$ac_cs_root.sacfiles" "\$ac_given_srcdir" "\$ac_given_INSTALL"
-fi
-rm -f \$ac_cs_root.s*
-
-EOF
-    return;
-}
-
-sub insert_command_loop {
-    print <<EOF;
-  for ac_file in .. \$CONFIG_FILES ; do
-EOF
-}
diff --git a/admin/config.guess b/admin/config.guess
deleted file mode 100755
index 5145e35..0000000
--- a/admin/config.guess
+++ /dev/null
@@ -1,1363 +0,0 @@
-#! /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.
-
-timestamp='2002-10-21'
-
-# 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
-# (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 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 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
-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.
-
-# This shell variable is my proudest work .. or something. --bje
-
-set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
-(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
-   || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
-dummy=$tmpdir/dummy ;
-files="$dummy.c $dummy.o $dummy.rel $dummy" ;
-trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
-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 $files ;
-	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 ;
-unset files'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (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_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# 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
-	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
-	# 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.
-	eval $set_cc_for_build
-	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 -o $dummy $dummy.s 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"
-				;;
-			3-1307)
-				UNAME_MACHINE="alphaev7"
-				;;
-		esac
-	fi
-	rm -f $dummy.s $dummy && rmdir $tmpdir
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | 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-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    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
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	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 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	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`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${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
-    # > 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*:*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 ;;
-    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 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	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[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
-	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)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # 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 ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????: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:*:*)
-	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>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-		rm -f $dummy.c $dummy && rmdir $tmpdir
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *: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
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    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:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	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])
-		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`
-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
-		    rm -f $dummy.c $dummy && rmdir $tmpdir
-		fi ;;
-	esac
-	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
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-	rm -f $dummy.c $dummy && rmdir $tmpdir
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    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:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	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 '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 ;;
-    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 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *: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=`
-	rm -f $dummy.c && rmdir $tmpdir
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:3*)
-	echo i386-pc-interix3
-	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
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    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-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=`
-	rm -f $dummy.c && rmdir $tmpdir
-	test x"${CPU}" != x && echo "${CPU}-pc-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 ;;
-    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.
-	# 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 targets: *//
-				    s/ .*//
-				    p'`
-        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
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	rm -f $dummy.c && rmdir $tmpdir
-	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.*)
-        # 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.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	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_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    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|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 ;;
-    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
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	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)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    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: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:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    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 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    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*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# 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*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    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:*:*)
-	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
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-[DGKLNPTVW]: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>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# 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)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
-rm -f $dummy.c $dummy && rmdir $tmpdir
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-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 --git a/admin/config.pl b/admin/config.pl
deleted file mode 100644
index 034042e..0000000
--- a/admin/config.pl
+++ /dev/null
@@ -1,236 +0,0 @@
-#!/usr/bin/env perl
-# a script for use by autoconf to make the Makefiles
-# from the Makefile.in's
-#
-# the original autoconf mechanism first splits all substitutions into groups
-# of ca. 90, and than invokes sed for _every_ Makefile.in and every group
-# (so around 2-3 times per Makefile.in). So this takes forever, as sed
-# has to recompile the regexps every time.
-#
-# this script does better. It changes all Makefile.ins in one process.
-# in kdelibs the time for building Makefile went down from 2:59 min to 13 sec!
-#
-# written by Michael Matz <matz@kde.org>
-# adapted by Dirk Mueller <mueller@kde.org>
-
-#   This file 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; see the file COPYING.LIB.  If not, write to
-#   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#   Boston, MA 02111-1307, USA.
-
-use strict;
-
-use File::Path;
-
-my $ac_subs=$ARGV[0];
-my $ac_sacfiles = $ARGV[1];
-my $ac_given_srcdir=$ARGV[2];
-my $ac_given_INSTALL=$ARGV[3];
-
-my @comp_match;
-my @comp_subs;
-
-#print "ac_subs=$ac_subs\n";
-#print "ac_sacfiles=$ac_sacfiles\n";
-#print "ac_given_srcdir=$ac_given_srcdir\n";
-#print "ac_given_INSTALL=$ac_given_INSTALL\n";
-
-my $configure_input;
-my ($srcdir, $top_srcdir);
-my $INSTALL;
-my $bad_perl = ($] < 5.005);
-my $created_file_count = 0;
-
-open(CF, "< $ac_subs") || die "can't open $ac_subs: $!";
-my @subs = <CF>;
-close(CF);
-chomp @subs;
-@comp_match=();
-@comp_subs=();
-
-if ($bad_perl) {
-    print "Using perl older than version 5.005\n";
-    foreach my $pat (@subs) {
-	if (  ($pat =~ m/s%([^%]*)%([^%]*)%g/ )
-	   || ($pat =~ m/s%([^%]*)%([^%]*)%;t/ )
-           || ($pat =~ m/s,([^,]*),(.*),;t/)
-	   || ($pat =~ m%s/([^/]*)/([^/]*)/g% )
-	   || ($pat =~ m%s/([^/]*)/([^/]*)/;t% )
-	   ) {
-            # form : s%bla%blubb%g
-            # or     s%bla%blubb%;t t   (autoconf > 2.13 and < 2.52 ?)
-            # or     s,bla,blubb,;t t   (autoconf 2.52)
-            my $srch = $1;
-            my $repl = $2;
-            $repl =~ s/\\(.)/$1/g;
-	    push @comp_subs, make_closure($srch, $repl);
-
-	} elsif ( ($pat =~ /%([^%]*)%d/ )
-	   || ($pat =~ m%/([^/]*)/d% )
-	   ) {
-	    push @comp_subs, make_closure($1, "");
-	} else {
-	    die "Uhh. Malformed pattern in $ac_subs ($pat)"
-		unless ( $pat =~ /^\s*$/ );   # ignore white lines
-	}
-    }
-} else {
-    foreach my $pat (@subs) {
-       if ( ($pat =~ /s%([^%]*)%([^%]*)%g/ ) ||
-            ($pat =~ /s%([^%]*)%([^%]*)%;t/ ) ||
-            ($pat =~ /s,([^,]*),(.*),;t/) ) {
-         # form : s%bla%blubb%g
-         # or     s%bla%blubb%;t t   (autoconf > 2.13 and < 2.52 ?)
-         # or     s,bla,blubb,;t t   (autoconf 2.52)
-         my $srch = $1;
-         my $repl = $2;
-         push @comp_match, eval "qr/\Q$srch\E/";  # compile match pattern
-         $repl =~ s/\\(.)/$1/g;
-         push @comp_subs, $repl;
-      } elsif ( ($pat =~ /%([^%]*)%d/ )
-                || ($pat =~ m%/([^/]*)/d% )
-              ) {
-        push @comp_match, eval "qr/\Q$1\E/";
-        push @comp_subs, "";
-      } else {
-          die "Uhh. Malformed pattern in $ac_subs ($pat)"
-          unless ( $pat =~ /^\s*$/ );   # ignore white lines
-      }
-    }
-}
-undef @subs;
-
-# read the list of files to be patched, form:
-# ./Makefile arts/Makefile arts/examples/Makefile arts/flow/Makefile
-
-open(CF, "< $ac_sacfiles") || die "can't open $ac_sacfiles: $!";
-my @ac_files = <CF>;
-close(CF);
-chomp @ac_files;
-
-
-my $ac_file;
-foreach $ac_file (@ac_files) {
-    next if $ac_file =~ /\.\./;
-    next if $ac_file =~ /^\s*$/;
-    my $ac_file_in;
-    my ($ac_dir, $ac_dots, $ac_dir_suffix);
-
-    if ($ac_file =~ /.*:.*/ ) {
-	($ac_file_in = $ac_file) =~ s%[^:]*:%%;
-	$ac_file =~ s%:.*%%;
-    } else {
-	$ac_file_in = $ac_file.".in";
-    }
-
-# Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-# Remove last slash and all that follows it.  Not all systems have dirname.
-    ($ac_dir = $ac_file) =~ s%/[^/][^/]*$%%;
-    if ( ($ac_dir ne $ac_file) && ($ac_dir ne ".")) {
-# The file is in a subdirectory.
-	if (! -d "$ac_dir") { mkpath "$ac_dir", 0, 0777; }
-	($ac_dir_suffix = $ac_dir) =~ s%^./%%;
-	$ac_dir_suffix="/".$ac_dir_suffix;
-# A "../" for each directory in $ac_dir_suffix.
-	($ac_dots = $ac_dir_suffix) =~ s%/[^/]*%../%g;
-    } else {
-	$ac_dir_suffix="";
-	$ac_dots="";
-    }
-
-    if ($ac_given_srcdir eq ".") {
-	$srcdir=".";
-	if ($ac_dots) {
-	    ( $top_srcdir = $ac_dots) =~ s%/$%%;
-	} else { $top_srcdir="."; }
-    } elsif ($ac_given_srcdir =~ m%^/%) {
-	$srcdir=$ac_given_srcdir.$ac_dir_suffix;
-	$top_srcdir = $ac_given_srcdir;
-    } else {
-	$srcdir = $ac_dots.$ac_given_srcdir.$ac_dir_suffix;
-	$top_srcdir = $ac_dots.$ac_given_srcdir;
-    }
-
-    if ($ac_given_INSTALL) {
-	if ($ac_given_INSTALL =~ m%^/% ) {
-	    $INSTALL = $ac_given_INSTALL;
-	} else {
-	    $INSTALL = $ac_dots.$ac_given_INSTALL;
-	}
-    }
-
-    print "fast creating $ac_file\n";
-    unlink $ac_file;
-    my $ac_comsub="";
-    my $fname=$ac_file_in;
-    $fname =~ s%.*/%%;
-    $configure_input="$ac_file.  Generated from $fname by config.pl.";
-
-    my $ac_file_inputs;
-    ($ac_file_inputs = $ac_file_in) =~ s%^%$ac_given_srcdir/%;
-    $ac_file_inputs =~ s%:% $ac_given_srcdir/%g;
-
-    patch_file($ac_file, $ac_file_inputs);
-    ++$created_file_count;
-}
-
-print "config.pl: fast created $created_file_count file(s).\n";
-
-sub patch_file {
-    my ($outf, $infiles) = @_;
-    my $filedata;
-    my @infiles=split(' ', $infiles);
-    my $i=0;
-
-    foreach my $name (@infiles) {
-	if (open(CF, "< $name")) {
-	    while (<CF>) {
-		$filedata .= $_;
-	    }
-	    close(CF);
-	} else {
-	    print STDERR "can't open $name: $!"."\n";
-	}
-    }
-
-    $filedata =~ s%\@configure_input\@%$configure_input%g;
-    $filedata =~ s%\@srcdir\@%$srcdir%g;
-    $filedata =~ s%\@top_srcdir\@%$top_srcdir%g;
-    $filedata =~ s%\@INSTALL\@%$INSTALL%g;
-
-    if ($bad_perl) {
-	while ($i <= $#comp_subs) {
-	    my $ref = $comp_subs[$i];
-	    &$ref(\$filedata);
-	    $i++;
-	}
-    } else {
-	while ($i <= $#comp_match) {
-	    $filedata =~ s/$comp_match[$i]/$comp_subs[$i]/g;
-	    $i++;
-	}
-    }
-    open(CF, "> $outf") || die "can't create $outf: $!";
-    print CF $filedata;
-    close(CF);
-}
-
-sub make_closure {
-    my ($pat, $sub) = @_;
-    my $ret = eval "return sub { my \$ref=shift; \$\$ref =~ s%\Q$pat\E%\Q$sub\E%g; }";
-    if ($@) {
-        print "can't create CODE: $@\n";
-    }
-    return $ret;
-}
diff --git a/admin/config.sub b/admin/config.sub
deleted file mode 100755
index 1dea9b7..0000000
--- a/admin/config.sub
+++ /dev/null
@@ -1,1470 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002 Free Software Foundation, Inc.
-
-timestamp='2002-09-05'
-
-# 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.
-#
-# 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
-# (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.
-
-# 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.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-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
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-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)
-		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
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		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/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-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.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| 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 \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| 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 \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | 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*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	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-* \
-	| clipper-* | 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-* \
-	| 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-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39 | mipstx39el \
-	| 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-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | 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
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		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
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	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
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		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
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		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
-		;;
-	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])
-		basic_machine=hppa1.0-hp
-		;;
-	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
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	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
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		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
-		;;
-	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
-		;;
-	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
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		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
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2)
-		basic_machine=i686-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-*)
-		basic_machine=i686-`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
-		;;
-	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
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3d)
-		basic_machine=alpha-cray
-		os=-unicos
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-        tic4x | c4x*)
-		basic_machine=tic4x-unknown
-		os=-coff
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-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
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	windows32)
-		basic_machine=i386-pc
-		os=-windows32-msvcrt
-		;;
-	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
-		;;
-
-# 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.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	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
-		;;
-	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	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
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # 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|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -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* | -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* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
-	# 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* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# 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
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# 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
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-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
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-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 --git a/admin/configure.in.bot.end b/admin/configure.in.bot.end
deleted file mode 100644
index fb483b6..0000000
--- a/admin/configure.in.bot.end
+++ /dev/null
@@ -1,12 +0,0 @@
-if test "$all_tests" = "bad"; then
-  if test ! "$cache_file" = "/dev/null"; then
-    echo ""    
-    echo "Please remove the file $cache_file after changing your setup"
-    echo "so that configure will find the changes next time."
-    echo ""
-  fi
-else
-  echo ""
-  echo "Good - your configure finished. Start make now"
-  echo ""
-fi
diff --git a/admin/configure.in.min b/admin/configure.in.min
deleted file mode 100644
index 7c7e25a..0000000
--- a/admin/configure.in.min
+++ /dev/null
@@ -1,57 +0,0 @@
-dnl    This file is part of the KDE libraries/packages
-dnl    Copyright (C) 2001 Stephan Kulow (coolo@kde.org)
- 
-dnl    This file is free software; you can redistribute it and/or
-dnl    modify it under the terms of the GNU Library General Public
-dnl    License as published by the Free Software Foundation; either
-dnl    version 2 of the License, or (at your option) any later version.
- 
-dnl    This library is distributed in the hope that it will be useful,
-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl    Library General Public License for more details.
- 
-dnl    You should have received a copy of the GNU Library General Public License
-dnl    along with this library; see the file COPYING.LIB.  If not, write to
-dnl    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-dnl    Boston, MA 02111-1307, USA.
-
-# Original Author was Kalle@kde.org
-# I lifted it in some mater. (Stephan Kulow)
-# I used much code from Janos Farkas
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(acinclude.m4) dnl a source file from your sub dir
-
-dnl This is so we can use kde-common
-AC_CONFIG_AUX_DIR(admin)
-
-dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
-unset CDPATH
-
-dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM 
-dnl Perform program name transformation
-AC_ARG_PROGRAM
-
-dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-KDE_SET_PREFIX
-
-dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-
-dnl Checks for programs.
-AC_CHECK_COMPILERS
-AC_ENABLE_SHARED(yes)
-AC_ENABLE_STATIC(no)
-KDE_PROG_LIBTOOL
-
-dnl for NLS support. Call them in this order!
-dnl WITH_NLS is for the po files
-AM_KDE_WITH_NLS
-
-dnl KDE_USE_QT
-AC_PATH_KDE
diff --git a/admin/cvs-clean.pl b/admin/cvs-clean.pl
deleted file mode 100644
index 35d48e9..0000000
--- a/admin/cvs-clean.pl
+++ /dev/null
@@ -1,87 +0,0 @@
-#! /usr/bin/perl
-
-#
-# This script recursively (beginning with the current directory)
-# wipes out everything not registered in CVS.
-#
-# written by Oswald Buddenhagen <ossi@kde.org>
-#  inspired by the "old" cvs-clean target from Makefile.common
-#
-# This file is free software in terms of the BSD license. That means
-# that you can do anything with it except removing this license or
-# the above copyright notice. There is NO WARRANTY of any kind.
-#
-
-sub rmrf()
-{
-  my $fn = shift;
-  lstat ($fn);
-  if (-d _) {
-    if (opendir (DIR, $fn)) {
-      for my $efn (grep (!/^\.\.?$/, readdir (DIR))) {
-	&rmrf ($fn."/".$efn);
-      }
-      closedir (DIR);
-      rmdir ($fn);
-    }
-  } else {
-    unlink ($fn);
-  }
-}
-
-sub newfiles()
-{
-  my ($indir, $incvs) = @_;
-  for my $n (keys (%$incvs)) { delete $$indir{$n} }
-  return sort (keys (%$indir));
-}
-
-sub cvsclean()
-{
-  my $dir = shift;
-  my (%dirsdir, %filesdir, %dirscvs, %filescvs);
-  my $dnam = $dir ? $dir : ".";
-  if (!opendir (DIR, $dnam)) {
-    print STDERR "Cannot enter \"".$dnam."\".\n";
-    return;
-  }
-  for my $fn (grep (!/^\.\.?$/, readdir (DIR))) {
-    if (-d $dir.$fn) {
-      $fn eq "CVS" or $dirsdir{$fn} = 1;
-    } else {
-      $filesdir{$fn} = 1;
-    }
-  }
-  closedir (DIR);
-  if (!open (FILE, "<".$dir."CVS/Entries")) {
-    print STDERR "No CVS information in \"".$dnam."\".\n";
-    return;
-  }
-  while (<FILE>) {
-    m%^D/([^/]+)/.*$% and $dirscvs{$1} = 1;
-    m%^/([^/]+)/.*$% and $filescvs{$1} = 1;
-  }
-  close (FILE);
-  if (open (FILE, "<".$dir."CVS/Entries.Log")) {
-    while (<FILE>) {
-      m%^A D/([^/]+)/.*$% and $dirscvs{$1} = 1;
-      m%^A /([^/]+)/.*$% and $filescvs{$1} = 1;
-      m%^R D/([^/]+)/.*$% and delete $dirscvs{$1};
-      m%^R /([^/]+)/.*$% and delete $filescvs{$1};
-    }
-    close (FILE);
-  }
-  for my $fn (&newfiles (\%filesdir, \%filescvs)) {
-    print ("F ".$dir.$fn."\n");
-    &rmrf ($dir.$fn);
-  }
-  for my $fn (&newfiles (\%dirsdir, \%dirscvs)) {
-    print ("D ".$dir.$fn."\n");
-    &rmrf ($dir.$fn);
-  }
-  for my $fn (sort (keys (%dirscvs))) {
-    &cvsclean ($dir.$fn."/");
-  }
-}
-
-&cvsclean ("");
diff --git a/admin/cvs.sh b/admin/cvs.sh
deleted file mode 100644
index 36c8a27..0000000
--- a/admin/cvs.sh
+++ /dev/null
@@ -1,648 +0,0 @@
-#! /bin/sh
-#
-# cvs.sh
-#
-# This file contains support code from Makefile.common
-# It defines a shell function for each known target
-# and then does a case to call the correct function.
-
-call_and_fix_autoconf()
-{
-  $AUTOCONF || exit 1
-  if test -r configure.in.in ; then
-    perl -pi -e "print \"if test \\\"x\\\$with_fast_perl\\\" = \\\"xyes\\\"; then\
-    \\n  perl -i.bak \\\$ac_aux_dir/conf.change.pl \\\$CONFIG_STATUS\
-    \\\\\\n    || mv \\\$CONFIG_STATUS.bak \\\$CONFIG_STATUS\
-    \\n  rm -f \\\$CONFIG_STATUS.bak\\nfi\
-    \\n\" if /^\\s*chmod\\s+.*\\+x\\s+.*CONFIG_STATUS/; s,^#line.*LINENO.*\$,/* \$& */, ;" configure
-  fi
-}
-
-strip_makefile()
-{
-  if test ! -f $makefile_wo; then
-    perl -e '$in=0; while ( <> ) { $in = 1 if ($_ =~ m/^if / ); print $_ unless ($in || $_ =~ m/^include /); $in = 0 if ($_ =~ m/^endif/); }' < $makefile_am > $makefile_wo
-  fi
-}
-
-check_autotool_versions()
-{
-required_autoconf_version="2.53 or newer"
-AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
-case $AUTOCONF_VERSION in
-  Autoconf*2.5* | autoconf*2.5* ) : ;;
-  "" )
-    echo "*** AUTOCONF NOT FOUND!."
-    echo "*** KDE requires autoconf $required_autoconf_version"
-    exit 1
-    ;;
-  * )
-    echo "*** YOU'RE USING $AUTOCONF_VERSION."
-    echo "*** KDE requires autoconf $required_autoconf_version"
-    exit 1
-    ;;
-esac
- 
-AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
-case $AUTOHEADER_VERSION in
-  Autoconf*2.5* | autoheader*2.5* ) : ;;
-  "" )
-    echo "*** AUTOHEADER NOT FOUND!."
-    echo "*** KDE requires autoheader $required_autoconf_version"
-    exit 1
-    ;;
-  * )
-    echo "*** YOU'RE USING $AUTOHEADER_VERSION."
-    echo "*** KDE requires autoheader $required_autoconf_version"
-    exit 1
-    ;;
-esac
-
-AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
-required_automake_version="1.6.1 or newer"
-case $AUTOMAKE_STRING in
-  automake*1.5d* | automake*1.5* | automake*1.5-* )
-    echo "*** YOU'RE USING $AUTOMAKE_STRING."
-    echo "*** KDE requires automake $required_automake_version"
-    exit 1
-    ;;
-  automake*1.6.* | automake*1.7* | automake*1.8* ) : ;;
-  "" )
-    echo "*** AUTOMAKE NOT FOUND!."
-    echo "*** KDE requires automake $required_automake_version"
-    exit 1
-    ;;
-  unsermake* ) :
-    echo "*** YOU'RE USING UNSERMAKE."
-    echo "*** GOOD LUCK!! :)"
-    ;;
-  * )
-    echo "*** YOU'RE USING $AUTOMAKE_STRING."
-    echo "*** KDE requires automake $required_automake_version"
-    exit 1
-    ;;
-esac
-unset required_automake_version
-}
-
-cvs()
-{
-check_autotool_versions
-acinclude_m4 
-
-### Make new subdirs and configure.in.
-### The make calls could be optimized away here,
-### with a little thought.
-if test -r configure.in.in; then
-    rm -f configure.in
-    echo "*** Creating list of subdirectories"
-    create_subdirs
-
-    if test -r Makefile.am.in; then
-        echo "*** Creating Makefile.am"
-        if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then 
-            strip_makefile
-            $MAKE -f $makefile_wo top_srcdir=. ./Makefile.am || exit 1
-        else
-            Makefile_am
-        fi
-     fi
-     configure_files
-     echo "*** Creating configure.in"
-     if grep '\$(top_srcdir)/configure.in:' $makefile_am >/dev/null; then 
-       strip_makefile
-       $MAKE -f $makefile_wo top_srcdir=. ./configure.in || exit 1
-     else
-       configure_in
-     fi
-fi
-
-echo "*** Creating aclocal.m4"
-$ACLOCAL $ACLOCALFLAGS || exit 1
-echo "*** Creating configure"
-call_and_fix_autoconf
-
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-  echo "*** Creating config.h template"
-  $AUTOHEADER || exit 1
-fi
-
-echo "*** Creating Makefile templates"
-$AUTOMAKE || exit 1
-if test -z "$UNSERMAKE"; then
-  echo "*** Postprocessing Makefile templates"
-  perl -w admin/am_edit || exit 1
-fi
-
-if egrep "^cvs-local:" $makefile_am >/dev/null; then \
-  strip_makefile
-  $MAKE -f $makefile_wo cvs-local top_srcdir=. || exit 1
-fi
-
-echo "*** Creating date/time stamp"
-touch stamp-h.in
-
-echo "*** Finished"
-echo "    Don't forget to run ./configure"
-echo "    If you haven't done so in a while, run ./configure --help"
-}
-
-dist()
-{
-check_autotool_versions
-
-###
-### First build all of the files necessary to do just "make"
-###
-acinclude_m4
-if test -r configure.in.in; then
-  rm -f configure.in
-  create_subdirs
-
-  if test -r Makefile.am.in; then
-    if grep '\$(top_srcdir)/Makefile.am:' $makefile_am >/dev/null; then 
-      strip_makefile
-      $MAKE -f $makefile_wo top_srcdir=. ./Makefile.am || exit 1
-    else
-      Makefile_am
-    fi
-  fi
-  configure_files
-  if grep '\$(top_srcdir)/configure.in:' $makefile_am >/dev/null; then 
-    strip_makefile
-    $MAKE -f $makefile_wo top_srcdir=. ./configure.in || exit 1
-  else
-    configure_in
-  fi
-fi
-$ACLOCAL $ACLOCALFLAGS
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-  echo "*** Creating config.h template"
-  $AUTOHEADER || exit 1
-fi
-$AUTOMAKE --foreign
-perl -w admin/am_edit
-call_and_fix_autoconf
-touch stamp-h.in
-if grep "^cvs-local:" $makefile_am >/dev/null; then
-  strip_makefile
-  $MAKE -f $makefile_wo cvs-local top_srcdir=.
-fi
-
-###
-### Then make messages
-###
-if test -d po; then
- LIST=`find ./po -name "*.po"`
- for i in $LIST; do
-  file2=`echo $i | sed -e "s#\.po#\.gmo#"`
-  msgfmt -o $file2 $i || touch $file2
- done
-fi
-if grep "^cvs-dist-local:" $makefile_am >/dev/null; then
-  strip_makefile
-  $MAKE -f $makefile_wo cvs-dist-local top_srcdir=.
-fi
-}
-
-subdir_dist()
-{
-$ACLOCAL $ACLOCALFLAGS
-$AUTOHEADER
-$AUTOMAKE
-perl -w ../admin/am_edit --path=../admin
-call_and_fix_autoconf
-touch stamp-h.in
-}
-
-configure_in()
-{
-rm -f configure.in configure.in.new
-kde_use_qt_param=
-test -f configure.files || { echo "need configure.files for configure.in"; exit 1; }
-list=`fgrep -v "configure.in.bot" < configure.files | fgrep -v "configure.in.mid"`
-: > configure.in.new
-for file in $list; do 
-  echo "dnl =======================================================" >> configure.in.new
-  echo "dnl FILE: $file" >> configure.in.new
-  echo "dnl =======================================================" >> configure.in.new
-  echo "" >> configure.in.new
-  cat $file >> configure.in.new
-done
-echo "KDE_CREATE_SUBDIRSLIST" >> configure.in.new
-if test -f Makefile.am.in; then
-  subdirs=`cat subdirs`
-  for dir in $subdirs; do
-    dir=`echo $dir | sed -e "s,[-+.],_,g"`
-    echo "AM_CONDITIONAL($dir""_SUBDIR_included, test \"x\$$dir""_SUBDIR_included\" = xyes)" >> configure.in.new
-    if test -f $dir/configure.in; then
-	echo "if test \"x\$$dir""_SUBDIR_included\" = xyes; then " >> configure.in.new
-	echo "  AC_CONFIG_SUBDIRS($dir)" >> configure.in.new
-	echo "fi" >> configure.in.new
-    fi
-  done
-fi
-
-echo "AC_CONFIG_FILES([ Makefile ])" >> configure.in.new
-if test -n "$UNSERMAKE"; then
-  echo "AC_CONFIG_FILES([ Makefile.rules ])" >> configure.in.new
-  echo "AC_CONFIG_FILES([ Makefile.calls ])" >> configure.in.new
-fi
-
-if test -f inst-apps; then
-    topleveldirs=`cat inst-apps`
-else
-    topleveldirs=
-    for dir in `ls -1d * | sort`; do
-	if test "$dir" != "debian" && test -d $dir; then
-	    topleveldirs="$topleveldirs $dir"
-	fi
-    done
-fi
-
-for topleveldir in $topleveldirs; do 
-  if test -f $topleveldir/configure.in; then
-	continue
-  fi
-  if test -f $topleveldir/Makefile.am; then :; else
-	continue
-  fi
-
-  mfs=`find $topleveldir -name Makefile.am -print | fgrep -v "/." | \
-       sed -e 's#\./##; s#/Makefile.am$##' | sort | sed -e 's#$#/Makefile#'`
-  for i in $mfs; do
-     echo "AC_CONFIG_FILES([ $i ])" >> configure.in.new
-     if test -n "$UNSERMAKE"; then
-        echo "AC_CONFIG_FILES([ $i.rules ])" >> configure.in.new
-	echo "AC_CONFIG_FILES([ $i.calls ])" >> configure.in.new
-     fi
-  done
-done
-
-files=`cat configure.files`
-list=`egrep '^dnl AC_OUTPUT\(.*\)' $files | sed -e "s#^.*dnl AC_OUTPUT(\(.*\))#\1#"`
-for file in $list; do 
-    echo "AC_CONFIG_FILES([ $file ])" >>  configure.in.new
-done
-
-if test -n "$UNSERMAKE"; then
-  echo "AC_CONFIG_FILES([ MakeVars ])" >> configure.in.new
-fi
-
-midfiles=`cat configure.files | fgrep "configure.in.mid"`
-test -n "$midfiles" && cat $midfiles >> configure.in.new
-
-echo "AC_OUTPUT" >> configure.in.new
-modulename=
-if test -f configure.in.in; then
-   if head -n 2 configure.in.in | egrep "^#MIN_CONFIG\(.*\)$" > /dev/null; then
-      kde_use_qt_param=`cat configure.in.in | sed -n -e "s/#MIN_CONFIG(\(.*\))/\1/p"`
-   fi
-   if head -n 2 configure.in.in | egrep "^#MIN_CONFIG" > /dev/null; then
-      line=`grep "^AM_INIT_AUTOMAKE(" configure.in.in`
-      if test -n "$line"; then
-	  modulename=`echo $line | sed -e "s#AM_INIT_AUTOMAKE(\([^,]*\),.*#\1#"`
-	  VERSION=`echo $line | sed -e "s#AM_INIT_AUTOMAKE([^,]*, *\([^)]*\)).*#\1#"`
-      fi
-      sed -e "s#AM_INIT_AUTOMAKE([^@].*#dnl PACKAGE set before#" \
-          configure.in.new > configure.in && mv configure.in configure.in.new
-   fi
-fi
-if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
-     VERSION="\"3.2.0\""
-fi
-if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
-   modulename=`pwd`; 
-   modulename=`basename $modulename`
-   esc_VERSION=`echo $VERSION | sed -e "s#[^.0-9a-zA-Z]##g"`
-   modulename=`echo $modulename | sed -e "s#-$esc_VERSION##"`   
-
-fi
-if test -n "$kde_use_qt_param"; then
-      sed -e "s#^dnl KDE_USE_QT#KDE_USE_QT($kde_use_qt_param)#" \
-      	configure.in.new > configure.in && mv configure.in configure.in.new
-fi
-sed -e "s#@MODULENAME@#$modulename#" configure.in.new |
-	sed -e "s#@VERSION@#$VERSION#" > configure.in
-botfiles=`cat configure.files | egrep "configure.in.bot"`
-test -n "$botfiles" && cat $botfiles >> configure.in
-cat $admindir/configure.in.bot.end >> configure.in
-rm -f configure.in.new
-}
-
-configure_files()
-{
-echo "*** Creating configure.files"
-admindir=NO
-for i in . .. ../.. ../../..; do
-  if test -x $i/admin; then admindir=$i/admin; break; fi
-done
-rm -f configure.files
-touch configure.files
-if test -f configure.in.in && head -n 2 configure.in.in | grep "^#MIN_CONFIG" > /dev/null; then
-	echo $admindir/configure.in.min >> configure.files
-fi
-test -f configure.in.in && echo configure.in.in >> configure.files
-# we collect files in the subdirs and do some sorting tricks, so subsubdirs come after subdirs
-if test -f inst-apps; then
-   inst=`cat inst-apps`
-   list=""
-   for i in $inst; do
-      list="$list `find $i/ -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \
-		sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`"
-   done
-else
-   list=`find . -name "configure.in.in" -o -name "configure.in.bot" -o -name "configure.in.mid" | \
-		sed -e "s,/configure,/aaaconfigure," | sort | sed -e "s,/aaaconfigure,/configure,"`
-fi
-for i in $list; do if test -f $i && test `dirname $i` != "." ; then
-  echo $i >> configure.files
-fi; done
-test -f configure.in.mid && echo configure.in.mid >> configure.files
-test -f configure.in.bot && echo configure.in.bot >> configure.files
-if test ! -s configure.files; then
-   echo "There are no files to build a configure. Please check your checkout."
-   exit 1
-fi
-}
-
-create_subdirs()
-{
-if grep '\$(top_srcdir)/subdirs:' $makefile_am >/dev/null; then 
-    # as many modules contain rules to create subdirs without any
-    # dependencies make won't create it unless there is no file.
-    # so we check if that's a dummy rule or one that works
-    rm -f subdirs.cvs.sh.$$
-    if test -f subdirs; then
-	mv subdirs subdirs.cvs.sh.$$
-    fi
-    strip_makefile
-    $MAKE -f $makefile_wo top_srcdir=. ./subdirs || exit 1
-    if test -f subdirs.cvs.sh.$$; then
-	if test -s subdirs; then
-	    rm subdirs.cvs.sh.$$ 
-	else
-	    mv subdirs.cvs.sh.$$ subdirs
-	fi
-    fi
-else
-    subdirs
-fi
-}
-
-subdirs()
-{
-dirs=
-idirs=
-if test -f inst-apps; then
-   idirs=`cat inst-apps`
-else
-   idirs=`ls -1 | sort`
-fi
-
-compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head -n 1`
-compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -n 1`
-for i in $idirs; do
-    if test -f $i/Makefile.am; then
-       case " $compilefirst $compilelast " in
-         *" $i "*) ;;
-         *) dirs="$dirs $i"
-       esac
-    fi
-done
-
-: > ./_SUBDIRS
-
-for d in $compilefirst; do
-   echo $d >> ./_SUBDIRS
-done
-
-(for d in $dirs; do 
-   list=`sed -ne "s#^COMPILE_BEFORE_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1`
-   for s in $list; do
-      echo $s $d
-   done
-   list=`sed -ne "s#^COMPILE_AFTER_$d""[ ]*=[ ]*##p" $makefile_am | head -n 1`
-   for s in $list; do
-      echo $d $s
-   done
-   echo $d $d
-done ) | tsort >> ./_SUBDIRS
-
-for d in $compilelast; do
-   echo $d >> ./_SUBDIRS
-done
-
-if test -r subdirs && cmp -s subdirs _SUBDIRS; then
-    rm -f _SUBDIRS
-fi
-test -r _SUBDIRS && mv _SUBDIRS subdirs || true
-}
-
-Makefile_am()
-{
-if test -f Makefile.am.in; then
-  compilefirst=`sed -ne 's#^COMPILE_FIRST[ ]*=[ ]*##p' $makefile_am | head -n 1`
-  compilelast=`sed -ne 's#^COMPILE_LAST[ ]*=[ ]*##p' $makefile_am | head -n 1`
-
-  idirs=
-  dirs=
-  if test -f inst-apps; then
-     idirs=`cat inst-apps`
-  else
-     idirs=`cat subdirs`
-  fi
-  for i in $idirs; do
-    case " $compilefirst $compilelast " in
-      *" $i "*) ;;
-      *) dirs="$dirs $i"
-    esac
-  done
-
-  if test -n "$UNSERMAKE"; then
-    cat Makefile.am.in > Makefile.am
-    topsubdirs=
-    for i in $compilefirst $dirs $compilelast; do
-       vari=`echo $i | sed -e "s,[-+],_,g"`
-       echo "if $vari""_SUBDIR_included" >> Makefile.am
-       echo "$vari""_SUBDIR=$i" >> Makefile.am
-       echo "endif" >> Makefile.am
-       topsubdirs="$topsubdirs \$($vari""_SUBDIR)"
-    done
-    echo "SUBDIRS=$topsubdirs" >> Makefile.am
-  else
-    cat Makefile.am.in | \
-        sed -e 's,^\s*\(COMPILE_BEFORE.*\),# \1,' | \
-        sed -e 's,^\s*\(COMPILE_AFTER.*\),# \1,' > Makefile.am
-    echo "SUBDIRS="'$(TOPSUBDIRS)' >> Makefile.am
-  fi
-fi
-}
-
-acinclude_m4()
-{
-  echo "*** Creating acinclude.m4"
-  adds=
-  if grep '\$(top_srcdir)/acinclude.m4:' $makefile_am >/dev/null; then 
-    strip_makefile
-    rm -f acinclude.m4
-    $MAKE -f $makefile_wo top_srcdir=. ./acinclude.m4 || exit 1
-    adds=`grep '\$(top_srcdir)/acinclude.m4:' $makefile_wo | sed -e 's,^[^:]*: *,,; s,\$(top_srcdir),.,g'`
-  else
-    rm -f acinclude.m4
-  fi
-  # if it wasn't created up to now, then we do it better
-  if test ! -f acinclude.m4; then
-     cat admin/acinclude.m4.in admin/libtool.m4.in $adds > acinclude.m4
-  fi
-}
-
-cvs_clean()
-{
-if test -d CVS; then :; else
-  echo "You don't have a toplevel CVS directory."
-  echo "You most certainly didn't use cvs to get these sources."
-  echo "But this function depends on cvs's information."
-  exit 1
-fi
-perl $admindir/cvs-clean.pl
-}
-
-package_merge()
-{
-catalogs=$POFILES
-for cat in $catalogs; do
-  msgmerge -o $cat.new $cat $PACKAGE.pot
-  if test -s $cat.new; then
-    grep -v "\"POT-Creation" $cat.new > $cat.new.2
-    grep -v "\"POT-Creation" $cat >> $cat.new.1
-    if diff $cat.new.1 $cat.new.2; then
-	rm $cat.new
-    else
-	mv $cat.new $cat
-    fi
-    rm -f $cat.new.1 $cat.new.2
-  fi
-done
-}
-
-package_messages()
-{
-rm -rf po.backup
-mkdir po.backup
-
-for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
-  egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > po.backup/$i
-  cat po/$i > po.backup/backup_$i
-  touch -r po/$i po.backup/backup_$i
-  rm po/$i
-done
-
-podir=${podir:-$PWD/po}
-files=`find . -name Makefile.am | xargs egrep -l '^messages:' `
-dirs=`for i in $files; do echo \`dirname $i\`; done`
-tmpname="$PWD/messages.log"
-if test -z "$EXTRACTRC"; then EXTRACTRC=extractrc ; fi
-if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
-export EXTRACTRC PREPARETIPS
-
-for subdir in $dirs; do
-  test -z "$VERBOSE" || echo "Making messages in $subdir"
-  (cd $subdir
-   if test -n "`grep -e '^messages:.*rc.cpp' Makefile.am`"; then
-	$EXTRACTRC *.rc *.ui *.kcfg > rc.cpp
-   else
-	candidates=`ls -1 *.rc *.ui *.kcfg 2>/dev/null`
-	if test -n "$candidates"; then
-	    echo "$subdir has *.rc, *.ui or *.kcfg files, but not correct messages line"
-	fi
-   fi
-   if test -n "`grep -r KAboutData *.c* *.C* 2>/dev/null`"; then
-	echo -e 'i18n("_: NAME OF TRANSLATORS\\n"\n"Your names")\ni18n("_: EMAIL OF TRANSLATORS\\n"\n"Your emails")' > _translatorinfo.cpp
-   else echo " " > _translatorinfo.cpp
-   fi
-   perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-   $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" \
-	XGETTEXT="${XGETTEXT:-xgettext} -C -ki18n -ktr2i18n -kI18N_NOOP -kaliasLocale -x ${includedir:-${KDEDIR:-/usr/local/kde}/include}/kde.pot" \
-	messages 
-   exit_code=$?
-   if test "$exit_code" != 0; then
-       echo "make exit code: $exit_code"
-   fi
-   ) 2>&1 | grep -v '^make\[1\]' > $tmpname
-   test -s $tmpname && { echo $subdir ; cat "$tmpname"; }
-   test -f $subdir/rc.cpp && rm -f $subdir/rc.cpp
-   rm -f $subdir/_translatorinfo.cpp
-   rm -f $subdir/_transMakefile
-done
-rm -f $tmpname
-for i in `ls -1 po.backup/*.pot 2>/dev/null | sed -e "s#po.backup/##" | egrep -v '^backup_'`; do
-  test -f po/$i || echo "disappeared: $i"
-done
-for i in `ls -1 po/*.pot 2>/dev/null | sed -e "s#po/##"`; do
-   msgmerge -q -o po/$i po/$i po/$i
-   egrep -v '^#([^:]|$)' po/$i | egrep '^.*[^ ]+.*$' | grep -v "\"POT-Creation" > temp.pot
-  if test -f po.backup/$i && test -n "`diff temp.pot po.backup/$i`"; then
-	echo "will update $i"
-	msgmerge -q po.backup/backup_$i po/$i > temp.pot
-	mv temp.pot po/$i
-  else
-    if test -f po.backup/backup_$i; then
-      test -z "$VERBOSE" || echo "I'm restoring $i"
-      mv po.backup/backup_$i po/$i
-      rm po.backup/$i
-    else
-      echo "will add $i"
-    fi
-  fi
-done
-rm -f temp.pot
-rm -rf po.backup
-}
-
-unset LC_ALL
-unset LANG
-unset LC_CTYPE
-unset LANGUAGE
-
-unset CDPATH
-admindir=`echo "$0" | sed 's%[\\/][^\\/][^\\/]*$%%'`
-test "x$admindir" = "x$0" && admindir=.
-
-test "x$MAKE" = x && MAKE=make
-makefile_am=Makefile.am
-makefile_wo=Makefile.am.wo
-if test -f Makefile.am.in; then
-  makefile_am=Makefile.am.in
-  makefile_wo=Makefile.am.in.wo
-  rm -f $makefile_wo
-fi
-
-# Suck in the AUTOCONF detection code
-. $admindir/detect-autoconf.sh
-
-###
-### Main
-###
-
-arg=`echo $1 | tr '\-.' __`
-case $arg in
-  cvs | dist | subdir_dist | configure_in | configure_files | subdirs | \
-  cvs_clean | package_merge | package_messages | Makefile_am | acinclude_m4 ) $arg ;;
-  configure ) call_and_fix_autoconf ;;
-  * ) echo "Usage: cvs.sh <target>"
-      echo "Target can be one of:"
-      echo "    cvs cvs-clean dist"
-      echo "    configure.in configure.files"
-      echo "    package-merge package-messages"
-      echo ""
-      echo "Usage: anything but $1"
-      exit 1 ;;
-esac
-
-if test -f $makefile_wo; then
-  rm $makefile_wo
-fi
-
-exit 0
diff --git a/admin/debianrules b/admin/debianrules
deleted file mode 100755
index 94eab8d..0000000
--- a/admin/debianrules
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/perl -w
-
-use Shell qw(mv cp mkdir rm) ;
-use File::Find;
-use Cwd;
-
-$origPwd = `pwd`;
-chomp $origPwd;
-
-$kde_confdir		=	"/etc/kde3";
-$kde_prefix		=	"/usr";
-$kde_bindir		=	"$kde_prefix/bin";
-$kde_includedir		=	"$kde_prefix/include/kde";
-$kde_libdir		=	"$kde_prefix/lib";
-$kde_cgidir		=	"$kde_prefix/lib/cgi-bin";
-$kde_moduledir		=	"$kde_prefix/lib/kde3";
-$kde_appsdir		=	"$kde_prefix/share/applnk";
-$kde_datadir		=	"$kde_prefix/share/apps";
-$kde_htmldir		=	"$kde_prefix/share/doc/kde/HTML";
-$kde_icondir		=	"$kde_prefix/share/icons";
-$kde_locale		=	"$kde_prefix/share/locale";
-$kde_mimedir		=	"$kde_prefix/share/mimelnk";
-$kde_servicesdir	=	"$kde_prefix/share/services";
-$kde_servicetypesdir	=	"$kde_prefix/share/servicetypes";
-$kde_sounddir		=	"$kde_prefix/share/sounds";
-$kde_templatesdir	=	"$kde_prefix/share/templates";
-$kde_wallpaperdir	=	"$kde_prefix/share/wallpapers";
-
-$mandir			=	"$kde_prefix/share/man";
-$infodir		=	"$kde_prefix/share/info";
-$sysconfdir		=	"/etc";
-
-$QTDIR			=	"/usr/share/qt3";
-$IDL			=	"$kde_bindir/cuteidl";
-$DCOPIDL		=	"$kde_bindir/dcopidl";
-$DCOPIDL2CPP		=	"$kde_bindir/dcopidl2cpp";
-$KDB2HTML		=	"$kde_bindir/kdb2html";
-$MCOPIDL		=	"$kde_bindir/mcopidl";
-$ARTSCCONFIG		=	"$kde_bindir/artsc-config";
-
-if (defined $ENV{DEB_BUILD_OPTIONS} &&
-    $ENV{DEB_BUILD_OPTIONS} =~ /\bdebug\b/) {
-  $enable_debug="--enable-debug=full";
-  $enable_final="";
-}
-else {
-  $enable_debug="--disable-debug";
-  if (defined $ENV{DEB_BUILD_OPTIONS} &&
-              $ENV{DEB_BUILD_OPTIONS} =~ /\bfinal\b/) {
-	  $enable_final="--enable-final";
-  } else {
-	  $enable_final="";
-  }
-}
-
-if (@ARGV && $ARGV[0] eq 'echodirs') {
-  print STDOUT "export kde_confdir=$kde_confdir\n";
-  print STDOUT "export kde_prefix=$kde_prefix\n";
-  print STDOUT "export kde_bindir=$kde_bindir\n";
-  print STDOUT "export kde_includedir=$kde_includedir\n";
-  print STDOUT "export kde_libdir=$kde_libdir\n";
-  print STDOUT "export kde_cgidir=$kde_cgidir\n";
-  print STDOUT "export kde_moduledir=$kde_moduledir\n";
-  print STDOUT "export kde_appsdir=$kde_appsdir\n";
-  print STDOUT "export kde_datadir=$kde_datadir\n";
-  print STDOUT "export kde_htmldir=$kde_htmldir\n";
-  print STDOUT "export kde_icondir=$kde_icondir\n";
-  print STDOUT "export kde_locale=$kde_locale\n";
-  print STDOUT "export kde_mimedir=$kde_mimedir\n";
-  print STDOUT "export kde_servicesdir=$kde_servicesdir\n";
-  print STDOUT "export kde_servicetypesdir=$kde_servicetypesdir\n";
-  print STDOUT "export kde_sounddir=$kde_sounddir\n";
-  print STDOUT "export kde_templatesdir=$kde_templatesdir\n";
-  print STDOUT "export kde_wallpaperdir=$kde_wallpaperdir\n";
-
-  print STDOUT "export mandir=$mandir\n";
-  print STDOUT "export infodir=$infodir\n";
-  print STDOUT "export sysconfdir=$sysconfdir\n";
-
-  print STDOUT "export QTDIR=$QTDIR\n";
-  print STDOUT "export IDL=$IDL\n";
-  print STDOUT "export DCOPIDL=$DCOPIDL\n";
-  print STDOUT "export DCOPIDL2CPP=$DCOPIDL2CPP\n";
-  print STDOUT "export KDB2HTML=$KDB2HTML\n";
-  print STDOUT "export MCOPIDL=$MCOPIDL\n";
-  print STDOUT "export ARTSCCONFIG=$ARTSCCONFIG\n";
-  print STDOUT "export INSTALL_DATA=install -p -c -m 644\n";
-
-  print STDOUT "configkde=$enable_debug $enable_final --disable-rpath --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --sysconfdir=\$(sysconfdir) --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --infodir=\$(infodir) --with-xinerama\n";
-  print STDOUT "configkdevelop=$enable_debug $enable_final --disable-rpath --enable-docbase --enable-kdoc2 --libdir=\$(kde_libdir) --includedir=\$(kde_includedir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --with-kdelibsdoc-dir=/usr/share/doc/kdelibs3-doc/html --with-xinerama\n";
-  print STDOUT "configkdepim=$enable_debug $enable_final --disable-rpath --with-extra-includes=/usr/include/libpisock --enable-shared --prefix=\$(kde_prefix) --libexecdir=\$(kde_bindir) --with-qt-includes=/usr/include/qt3 --mandir=\$(mandir) --infodir=\$(infodir) --with-xinerama\n";
-
-  exit
-}
-
-if (@ARGV && $ARGV[0] eq 'echoglobals') {
-	print STDOUT "[Directories]\n";
-	print STDOUT "dir_config=$kde_confdir\n";
-	print STDOUT "dir_tmp=/tmp\n";
-	print STDOUT "dir_socket=/tmp\n";
-	print STDOUT "dir_exe=$kde_bindir\n";
-	print STDOUT "dir_lib=$kde_libdir\n";
-	print STDOUT "dir_cgi=$kde_cgidir\n";
-	print STDOUT "dir_module=$kde_moduledir\n";
-	print STDOUT "dir_apps=$kde_appsdir\n";
-	print STDOUT "dir_data=$kde_datadir\n";
-	print STDOUT "dir_html=$kde_htmldir\n";
-	print STDOUT "dir_icon=$kde_icondir\n";
-	print STDOUT "dir_locale=$kde_locale\n";
-	print STDOUT "dir_mime=$kde_mimedir\n";
-	print STDOUT "dir_services=$kde_servicesdir\n";
-	print STDOUT "dir_servicetypes=$kde_servicetypesdir\n";
-	print STDOUT "dir_sound=$kde_sounddir\n";
-	print STDOUT "dir_templates=$kde_templatesdir\n";
-	print STDOUT "dir_wallpaper=$kde_wallpaperdir\n";
-	print STDOUT "[General]\n";
-	print STDOUT "TerminalApplication=x-terminal-emulator\n";
-	exit
-}
diff --git a/admin/depcomp b/admin/depcomp
deleted file mode 100755
index 4c20c6c..0000000
--- a/admin/depcomp
+++ /dev/null
@@ -1,441 +0,0 @@
-#! /bin/sh
-
-# depcomp - compile a program generating dependencies as side-effects
-# Copyright 1999, 2000 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>.
-
-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
-# `libtool' can also be set to `yes' or `no'.
-
-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`}
-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.  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.
-  stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  outname="$stripped.o"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    # 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)
-  # Must come before tru64.
-
-  # Intel's C compiler understands `-MD -MF file'.  However
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # 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:
-
-  "$@" -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'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 AIX 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.
-
-   tmpdepfile1="$object.d"
-   tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` 
-   if test "$libtool" = yes; then
-      "$@" -Wc,-MD
-   else
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2"
-      exit $stat
-   fi
-
-   if test -f "$tmpdepfile1"; then
-      tmpdepfile="$tmpdepfile1"
-   else
-      tmpdepfile="$tmpdepfile2"
-   fi
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a space and a tab 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 proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  test -z "$dashmflag" && dashmflag=-M
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*) # this is libtool, let us make it quiet
-      for arg
-      do # cycle over the arguments
-        case "$arg" in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" $dashmflag | sed 's:^[^:]*\:[ 	]*:'"$object"'\: :' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  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)
-  # 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;;
-	-*)
-	  ;;
-	*)
-	  set fnord "$@" "$arg"; shift;;
-      esac
-    done
-    obj_suffix="`echo $object | sed 's/^.*\././'`"
-    touch "$tmpdepfile"
-    ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tail +3 "$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 proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  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 proprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  ( IFS=" "
-    case " $* " in
-    *" --mode=compile "*)
-      for arg
-      do # cycle over the arguments
-        case $arg in
-	"--mode=compile")
-	  # insert --quiet before "--mode=compile"
-	  set fnord "$@" --quiet
-	  shift # fnord
-	  ;;
-	esac
-	set fnord "$@" "$arg"
-	shift # fnord
-	shift # "$arg"
-      done
-      ;;
-    esac
-    "$@" -E |
-    sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  ) &
-  proc=$!
-  "$@"
-  stat=$?
-  wait "$proc"
-  if test "$stat" != 0; then exit $stat; fi
-  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
diff --git a/admin/detect-autoconf.sh b/admin/detect-autoconf.sh
deleted file mode 100644
index fae9c6d..0000000
--- a/admin/detect-autoconf.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#! /bin/sh
-
-# Global variables...
-AUTOCONF="autoconf"
-AUTOHEADER="autoheader"
-AUTOM4TE="autom4te"
-AUTOMAKE="automake"
-ACLOCAL="aclocal"
-
-
-# We don't use variable here for remembering the type ... strings.
-# local variables are not that portable, but we fear namespace issues with
-# our includer.  The repeated type calls are not that expensive.
-checkAutoconf()
-{
-  if test -x "`$WHICH autoconf-2.5x 2>/dev/null`" ; then	
-    AUTOCONF="`$WHICH autoconf-2.5x`"
-  elif test -x "`$WHICH autoconf-2.57 2>/dev/null`" ; then
-    AUTOCONF="`$WHICH autoconf-2.57`"
-  elif test -x "`$WHICH autoconf-2.56 2>/dev/null`" ; then
-    AUTOCONF="`$WHICH autoconf-2.56`"
-  elif test -x "`$WHICH autoconf-2.55 2>/dev/null`" ; then
-    AUTOCONF="`$WHICH autoconf-2.55`"
-  elif test -x "`$WHICH autoconf-2.54 2>/dev/null`" ; then
-    AUTOCONF="`$WHICH autoconf-2.54`"
-  elif test -x "`$WHICH autoconf-2.53 2>/dev/null`" ; then
-    AUTOCONF="`$WHICH autoconf-2.53`"
-  elif test -x "`$WHICH autoconf-2.53a 2>/dev/null`" ; then
-    AUTOCONF="`$WHICH autoconf-2.53a`"
-  elif test -x "`$WHICH autoconf-2.52 2>/dev/null`" ; then
-    AUTOCONF="`$WHICH autoconf-2.52`"
-  elif test -x "`$WHICH autoconf2.50 2>/dev/null`" ; then
-    AUTOCONF="`$WHICH autoconf2.50`"
-  fi
-}
-
-checkAutoheader()
-{
-  if test -x "`$WHICH autoheader-2.5x 2>/dev/null`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.5x`"
-    AUTOM4TE="`$WHICH autom4te-2.5x`"
-  elif test -x "`$WHICH autoheader-2.57 2>/dev/null`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.57`"
-    AUTOM4TE="`$WHICH autom4te-2.57`"
-  elif test -x "`$WHICH autoheader-2.56 2>/dev/null`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.56`"
-    AUTOM4TE="`$WHICH autom4te-2.56`"
-  elif test -x "`$WHICH autoheader-2.55 2>/dev/null`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.55`"
-    AUTOM4TE="`$WHICH autom4te-2.55`"
-  elif test -x "`$WHICH autoheader-2.54 2>/dev/null`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.54`"
-    AUTOM4TE="`$WHICH autom4te-2.54`"
-  elif test -x "`$WHICH autoheader-2.53 2>/dev/null`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.53`"
-    AUTOM4TE="`$WHICH autom4te-2.53`"
-  elif test -x "`$WHICH autoheader-2.53a 2>/dev/null`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.53a`"
-    AUTOM4TE="`$WHICH autom4te-2.53a`"
-  elif test -x "`$WHICH autoheader-2.52 2>/dev/null`" ; then
-    AUTOHEADER="`$WHICH autoheader-2.52`"
-  elif test -x "`$WHICH autoheader2.50 2>/dev/null`" ; then
-    AUTOHEADER="`$WHICH autoheader2.50`"
-  fi
-}
-
-checkAutomakeAclocal ()
-{
- if test -x "`$WHICH automake-1.6 2>/dev/null`" ; then
-    AUTOMAKE="`$WHICH automake-1.6`"
-    ACLOCAL="`$WHICH aclocal-1.6`"
-  elif test -x "`$WHICH automake-1.7 2>/dev/null`" ; then
-    AUTOMAKE="`$WHICH automake-1.7`"
-    ACLOCAL="`$WHICH aclocal-1.7`"
-  fi
-  if test -n "$UNSERMAKE"; then 
-     AUTOMAKE="$UNSERMAKE"
-  fi
-}
-
-checkWhich ()
-{
-  WHICH=""
-  for i in "type -p" "which" "type" ; do
-    T=`$i sh 2> /dev/null`
-    test -x "$T" && WHICH="$i" && break
-  done
-}
-
-checkWhich
-checkAutoconf
-checkAutoheader
-checkAutomakeAclocal
-
-export WHICH AUTOHEADER AUTOCONF AUTOM4TE AUTOMAKE ACLOCAL
diff --git a/admin/install-sh b/admin/install-sh
deleted file mode 100755
index 36f96f3..0000000
--- a/admin/install-sh
+++ /dev/null
@@ -1,276 +0,0 @@
-#!/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
-#
-# 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.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# 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}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-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 "$0: no input file specified" >&2
-	exit 1
-else
-	:
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-
-	if [ -d "$dst" ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	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" ] || [ -d "$src" ]
-	then
-		:
-	else
-		echo "$0: $src does not exist" >&2
-		exit 1
-	fi
-
-	if [ x"$dst" = x ]
-	then
-		echo "$0: no destination specified" >&2
-		exit 1
-	else
-		:
-	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
-		:
-	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
-
-# 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=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp=$pathcomp$1
-	shift
-
-	if [ ! -d "$pathcomp" ] ;
-        then
-		$mkdirprog "$pathcomp"
-	else
-		:
-	fi
-
-	pathcomp=$pathcomp/
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$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
-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
-		:
-	fi
-
-# Make a couple of temp file names in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-	rmtmp=$dstdir/#rm.$$#
-
-# Trap to clean up temp files at exit.
-
-	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-	trap '(exit $?); exit' 1 2 13 15
-
-# 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
-
-# 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 :;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 $mvcmd "$dsttmp" "$dstdir/$dstfile"
-
-fi &&
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-
-{
-	(exit 0); exit
-}
diff --git a/admin/libtool.m4.in b/admin/libtool.m4.in
deleted file mode 100644
index c274015..0000000
--- a/admin/libtool.m4.in
+++ /dev/null
@@ -1,5854 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
-## 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.
-
-# serial 47 AC_PROG_LIBTOOL
-
-
-# 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])])])
-
-
-# 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"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-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
-
-# 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
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-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
-])# _LT_AC_SYS_COMPILER
-
-
-# _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
-
-
-# _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)
-  # 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.
-
-  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)
-])])# _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*)
-      LINUX_64_MODE="32"
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*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*)
-      LINUX_64_MODE="64"
-      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
-  testring="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;
-    ;;
-
- *)
-    # 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.
-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      testring=$testring$testring
-    done
-    testring=
-    # 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],
-[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*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
-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
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# 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
-
-   # 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 .
-
-   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* out/*
-   rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# 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
-
-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
-
-
-# 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
-  # 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
-
-
-# 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
-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
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# 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
-   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
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# 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=".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"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-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
-  ;;
-
-bsdi4*)
-  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=".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='$(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
-  ;;
-
-freebsd*-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='.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='.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='.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'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
-      libsuff=64
-    fi
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-  # 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'
-  ;;
-
-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}${release}${shared_ext} ${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=".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
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _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
-
-  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"; 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
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# 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
-
-
-# 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
-
-
-# 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
-
-
-# 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
-
-
-# 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
-
-
-# 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
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# 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
-
-
-# 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
-
-
-# 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])
-])])
-
-
-# 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
-
-*** 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
-
-
-# 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
-  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
-])# 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'
-])# 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
-  ;;
-
-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
-  ;;
-
-cygwin* | mingw* | pw32*)
-  # 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='win32_libid'
-  ;;
-
-darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  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=`/System/Library/Frameworks/System.framework/System`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-  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 $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 must be Linux ELF.
-linux*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
-  arm* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
-  esac
-  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]]+|_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*)
-  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
-  ;;
-
-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
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-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
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# 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")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# 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([AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-
-# 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
-
-
-#
-# 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*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      ;;
-    esac
-    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}'
-    _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)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=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"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# 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([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
-      # KDE requires run time linking.  Make it the default.
-      aix_use_runtimelinking=yes
-      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='-qmkshrobj ${wl}-G'
-	else
-	  shared_flag='-qmkshrobj'
-	fi
-      fi
-    fi
-
-    # Let the compiler handle the export list.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    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_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` '" $shared_flag"
-      _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}$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*)
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep '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 ${wl}-bind_at_load -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 ${wl}-bind_at_load $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 ${wl}-bind_at_load -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}'
-    _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)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  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*)
-    # 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) | egrep "\-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
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_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'
-	_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::"'
-    ;;
-  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
-])# 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|*.$libext)
-       # 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*)
-  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
-
-## 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"
-])# 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 \
-    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.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# 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=$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='$shrext'
-
-# 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.
-  test -f Makefile && make "$ltmain"
-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'"
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris* | sysv5*)
-  symcode='[[BDT]]'
-  ;;
-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='[[ABCDGISTW]]' ;;
-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
-	;;
-      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*)
-	# 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
-      ;;
-
-    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.
-
-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
-      ;;
-
-    *)
-      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
-
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
-	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='-qmkshrobj ${wl}-G'
-	  else
-	    shared_flag='-qmkshrobj'
-  	fi
-	fi
-      fi
-
-      # Let the compiler handle the export list.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      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_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` '" $shared_flag"
-	_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}$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
-      ;;
-
-    bsdi4*)
-      _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=".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*)
-    if test "$GXX" = yes ; then
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      case "$host_os" in
-      rhapsody* | darwin1.[[012]])
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-	test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep '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 ${wl}-bind_at_load -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 ${wl}-bind_at_load $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 ${wl}-bind_at_load -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}'
-      _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)='-all_load $convenience'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    else  
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    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*)
-      _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(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
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# 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])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-############################################################
-# 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])
-])
diff --git a/admin/ltmain.sh b/admin/ltmain.sh
deleted file mode 100644
index b36e997..0000000
--- a/admin/ltmain.sh
+++ /dev/null
@@ -1,6343 +0,0 @@
-# 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, 2003
-# 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.
-
-# 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"
-
-# Constants.
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5a
-TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# 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.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# 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
-
-# Make sure IFS has a sensible default
-: ${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
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# 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.
-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 | \
-      grep -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
-}
-
-# End of Shell function definitions
-#####################################
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit 1
-	;;
-      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$" < "$0" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $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 0
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
-    # 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" < "$0"
-    done
-    exit 0
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit 0
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    ;;
-
-  --tag) prevopt="--tag" prev=tag ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-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.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # 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 | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # 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
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_output=
-    arg_mode=normal
-    libobj=
-
-    for arg
-    do
-      case "$arg_mode" in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	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 1
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static)
-	  build_old_libs=yes
-	  continue
-	  ;;
-
-	-prefer-pic)
-	  pic_mode=yes
-	  continue
-	  ;;
-
-	-prefer-non-pic)
-	  pic_mode=no
-	  continue
-	  ;;
-
-	-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/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      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.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit 1
-      ;;
-    target)
-      $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='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.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/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit 1
-      ;;
-    esac
-
-    # 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.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile 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` "*) ;;
-      # 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$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case "$base_compile " in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # 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 1
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-
-    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
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit 1" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    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
-
-    # 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
-      output_obj=
-      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 $run 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
-
-    $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
-	command="$base_compile $srcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      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 -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $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, then go on to compile the next one
-      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
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      suppress_output=' >/dev/null 2>&1'
-    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
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      else
-	command="$base_compile $srcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$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 -n "$output_obj" && 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
-
-      # 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
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-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 invocation.
-      # 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
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    add_flags=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-	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
-	  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
-	prefer_static_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    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
-      arg="$1"
-      base_compile="$base_compile $arg"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # 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)
-	  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=
-	    continue
-	    ;;
-	  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
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$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 1
-		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 1
-		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 1
-	  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
-	    ;;
-	  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
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  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
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -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
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	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* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	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: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit 1
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-freebsd*-gnu*)
-	    # prevent being parsed by the freebsd regexp below
-	    ;;
-	  *-*-mingw* | *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-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
-	 *-*-freebsd*-gnu*)
-	   # prevent being parsed by the freebsd regexp below
-	   ;;
-	 *-*-openbsd*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	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
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	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)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# 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
-	add_flags="$add_flags $arg"
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.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
-	  */* | *\\*) . $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 1
-	  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 1
-	  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
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# 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
-	add_flags="$add_flags $arg"
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # 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 link
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile 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` "*) ;;
-      # 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$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case $base_compile in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in $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 1
-#       else
-#         $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-
-    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
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    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 object directory.
-    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
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplcations 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)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      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=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit 1
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      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" ;;
-	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
-	-l*)
-	  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 && test "$allow_undefined" = yes; 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
-	    for search_ext in .la $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
-	    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
-	  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
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    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
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  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."
-	    else
-	      $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
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  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
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	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 | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit 1
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { 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
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    #echo "Adding $deplib to \$deplibs"
-	    deplibs="$deplib $deplibs"
-            if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-            fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-	  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
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit 1
-	  fi
-	  continue
-	fi # $pass = conv
-
-    
-	# 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 \`$lib'" 1>&2
-	  exit 1
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit 1
-	  fi
-	  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.  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
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	else
-	  dir="$ladir/$objdir"
-	  absdir="$abs_ladir/$objdir"
-	  # Remove this search path later
-	  notinst_path="$notinst_path $abs_ladir"
-	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 -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit 1
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  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" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-    
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -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
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	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
-
-	    # 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 # $linkmode,$pass = prog,link...
-
-	  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
-	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
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # 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"
-
-	    # 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\"
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    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\"
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    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 | grep "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" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		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="-L$inst_prefix_dir$libdir $add_dir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-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
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) 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="-L$inst_prefix_dir$libdir $add_dir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	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.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # 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."
-	    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."
-	      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
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	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
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  #fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# 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
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  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
-		  if test "$absdir" != "$libdir"; then
-		    # Sure, some shells/systems don't implement the -ef.
-		    # Those will have to live with the warning.
-		    test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
-		      $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  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
-		    path=""
-		  fi
-		  ;;
-		*)
-		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="$deplibs $depdepl" ;;
-	      esac	      
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$deplibs $path" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      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
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  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" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      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
-      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
-
-      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/-version-number' 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
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext\"
-	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
-	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\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      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
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # 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/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	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
-
-	# 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
-	0 | [1-9] | [1-9][0-9] | [1-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
-	  exit 1
-	  ;;
-	esac
-
-	case $revision in
-	0 | [1-9] | [1-9][0-9] | [1-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
-	  exit 1
-	  ;;
-	esac
-
-	case $age in
-	0 | [1-9] | [1-9][0-9] | [1-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
-	  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) ;;
-
-	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"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	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" -ne 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"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $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=
-	  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="0.0"
-	    ;;
-	  esac
-	  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
-      fi
-
-      if test "$mode" != relink; then
-	# 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}.*)
-	       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.
-      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
-
-      # 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'`
-      done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-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"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-freebsd*-gnu*)
-	    # Prevent $arg from being parsed by the freebsd regexp below.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  *-*-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
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# 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 behavior.
-	  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
-	  $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 "$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 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 "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  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."
-		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 $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-            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
-			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
-	      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"
-		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
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  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
-	      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
-	      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"
-		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
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  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."
-	    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
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	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."
-
-	    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
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  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
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
-	  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
-		  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\"
-		dep_rpath="$dep_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"
-	    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.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext\"
-	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
-	if test -z "$dlname"; then
-	  dlname=$soname
-	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" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# 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\"
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      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 "$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
-
-	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
-	      # 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 $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	      if ($AR t "$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 "$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 "$xdir/$name_to"
-		   do
-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		   done
-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		   i=`expr $i + 1`
-		  done
-		done
-	      fi
-
-	      libobjs="$libobjs "`find $xdir -name \*.$objext -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\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Add all flags from the command line.  We here create a library,
-	# but those flags were only added to compile_command and
-	# finalize_command, which are only used when creating executables.
-	# So do it by hand here.
-	compiler_flags="$compiler_flags $add_flags"
-	# Only add it to commands which use CC, instead of LD, i.e.
-	# only to $compiler_flags
-	#linker_flags="$linker_flags $add_flags"
-
-	# 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 cmds=\"$module_expsym_cmds\"
-	  else
-	    eval cmds=\"$module_cmds\"
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval cmds=\"$archive_expsym_cmds\"
-	else
-	  eval cmds=\"$archive_cmds\"
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # 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 -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval cmds=\"$archive_expsym_cmds\"
-	  else
-	    eval cmds=\"$archive_cmds\"
-	  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"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-
-	# 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
-	fi
-
-	# 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
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      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 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 for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; 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"
-	;;
-      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
-	    # 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 $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	    if ($AR t "$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 "$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 "$xdir/$name_to"
-		 do
-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		 done
-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		 i=`expr $i + 1`
-		done
-	      done
-	    fi
-
-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	  done
-	fi
-      fi
-
-      # Create the old-style object.
-      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\"
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      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
-	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" || 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\"
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit 0
-      ;;
-
-    prog)
-      case $host in
-	*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
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = 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
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# 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 /'`
-	;;
-      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"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # 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
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  ;;
-	esac
-      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"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# 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
-
-      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
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      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 lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  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$old_deplibs" | $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
-	      $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" |
-		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
-	    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 >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#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[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 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
-
-	  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 -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $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"
-	  $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
-	# 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
-
-      # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
-      # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
-      # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
-      # This does not apply on AIX for ia64, which uses a SysV linker.
-      case "$host" in
-        ia64-*-aix5*) ;;
-        *-*-aix4* | *-*-aix5*)
-                   compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
-                   finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
-      esac
-
-      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"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	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"
-      fi
-
-      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"
-      fi
-
-      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 "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit 0
-      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 "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      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";;
-	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
-	# 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
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *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 1" 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
-
-	$echo > $output "\
-#! $SHELL
-
-# $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 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 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
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  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 "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # 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'$exeext
-  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 relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$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\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# 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
-    # 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
-
-	# 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 "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
-    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
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit 0
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    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="$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
-	  # 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 $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	  if ($AR t "$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 "$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 "$xdir/$name_to"
-	       do
-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-	       done
-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-	       i=`expr $i + 1`
-	      done
-	    done
-	  fi
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-	done
-      fi
-
-      compiler_flags="$compiler_flags $add_flags"
-
-      # 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
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	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
-	      # 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
-	  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
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	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.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $0 --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
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		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
-		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`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      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
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    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 | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $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='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# 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 && test "$fast_install" = no; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	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 $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit 0
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg="$nonopt"
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest="$arg"
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*) ;;
-
-      *)
-	# 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.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # 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
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [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
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	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
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# 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"
-
-	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 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
-	    exit 1
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  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\"
-	  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.
-
-	# 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"`
-	  ;;
-	*.$objext)
-	  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"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit 0
-	;;
-
-      *)
-	# 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
-
-	# 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=$file
-	    ;;
-	esac
-	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
-	  */* | *\\*) . ${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
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; 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'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  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
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  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
-	      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'`
-
-	      $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$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*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$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\"
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    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'
-    else
-      exit 0
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	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\"
-	  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" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    exit 0
-
-    $echo "----------------------------------------------------------------------"
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $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:"
-    if test -n "$shlibpath_var"; then
-      $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"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $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 "----------------------------------------------------------------------"
-    exit 0
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit 1
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	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
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit 1
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	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 ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # 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"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment 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 prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit 0
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    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="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-	  if test "$mode" = uninstall; then
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      eval cmds=\"$postuninstall_cmds\"
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      eval cmds=\"$old_postuninstall_cmds\"
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# 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
-	;;
-
-      *)
-	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
-
-	    # 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
-	;;
-      esac
-      $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
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit 1
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-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 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]
-    --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:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      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.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit 0
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-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
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -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.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-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 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-fast-install  disable the fast-install mode
-  -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
-  -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]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-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, except when creating a convenience library.
-
-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 \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit 0
-
-# 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
-# sh-indentation:2
-# End:
diff --git a/admin/missing b/admin/missing
deleted file mode 100755
index 6a37006..0000000
--- a/admin/missing
+++ /dev/null
@@ -1,336 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 1999, 2000, 2002 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
-# 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.
-
-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.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-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'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  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
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing 0.4 - GNU automake"
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-  aclocal*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    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
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    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
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    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
-         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}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    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}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    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
-         proper tools for further handling them.
-         You can get \`$1Help2man' 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
-         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."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' 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."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  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)
-    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
-       # We have makeinfo, but it failed.
-       exit 1
-    fi
-
-    echo 1>&2 "\
-WARNING: \`$1' is missing on your system.  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,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-    if test -n "$run"; then
-      echo 1>&2 "ERROR: \`tar' requires --run"
-      exit 1
-    fi
-
-    # 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
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequirements 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
-    ;;
-esac
-
-exit 0
diff --git a/admin/mkinstalldirs b/admin/mkinstalldirs
deleted file mode 100755
index d2d5f21..0000000
--- a/admin/mkinstalldirs
+++ /dev/null
@@ -1,111 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage" 1>&2
-      exit 0
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --)                         # 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
-
-case $dirmode in
-  '')
-    if mkdir -p -- . 2>/dev/null; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    fi
-    ;;
-esac
-
-for file
-do
-  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
-      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
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# End:
-# mkinstalldirs ends here
diff --git a/admin/nmcheck b/admin/nmcheck
deleted file mode 100755
index 1544713..0000000
--- a/admin/nmcheck
+++ /dev/null
@@ -1,371 +0,0 @@
-#!/usr/bin/perl -w
-
-# Check namespace cleanness of a library.
-# Allowed symbols are passed as arguments.
-# They may have trailing * = wildcard.
-# Wildcards may be also specified as *::* (e.g. K*::* for all KDE classes)
-# Symbols are listed as full function unmangled names without arguments,
-# e.g. 'foo bar* nspace::*' allows foo(), foo(int), bar(), barbar()
-# and all symbols in namespace/class nspace.
-# If an argument has comma in it, it's a filename of a file containing
-# allowed symbols, one per line.
-
-
-$thisProg   = "$0";     # This programs name
-
-$library = "";
-$allowed_symbols = "";
-$debug = 0;
-$allowed_weak = "";
-$weak_specified = 0;
-
-while( defined( $ARGV[ 0 ] ))
-{
-    $_ = shift;
-    if( /^--verbose$|^-v$/ )
-    {
-	$debug = 1;
-    }
-    elsif( /^--help$|^-h$/ )
-    {
-        print STDOUT "Usage $thisProg [OPTION] ... library [allowed symbols] ...\n",
-                "\n",
-		"Check if the given library has only allowed public symbols.\n",
-                "\n",
-		"  --allowweak=[symbol] allow only these weak symbols\n",
-                "  -v, --verbose        verbosely list files processed\n",
-                "  -h, --help           print this help, then exit\n";
-        exit 0;
-    }
-    elsif( /^--allowweak=(.*)$/ )
-    {
-	$allowed_weak .= " " . $1;
-	$weak_specified = 1;
-    }
-    elsif( /^--allowweak$/ ) # simply list all weak
-    {
-	$allowed_weak .= " ";
-	$weak_specified = 1;
-    }
-    elsif( /^--*/ )
-    {
-	die "Invalid argument!\n";
-    }
-    else
-    {
-	if( ! $library )
-	{
-	    $library = $_;
-	}
-	else
-	{
-	    $allowed_symbols .= " " . $_;
-	}
-    }
-}
-
-if( ! $weak_specified )
-{
-    $allowed_weak = "*"; 
-    # allow all weak symbols by default
-    # instances of templates and similar stuff - unfortunately includes also things from other libraries,
-    # so it cannot be on by default
-}
-
-print STDERR "library:" . $library . "\n" if $debug;
-print STDERR "allowed_symbols:" . $allowed_symbols . "\n" if $debug;
-print STDERR "allowed_weak:" . $allowed_weak . "\n" if $debug;
-
-$default_symbols = "_fini _init";  # system symbols
-# on my system, every .so has :
-# A _DYNAMIC
-# A _GLOBAL_OFFSET_TABLE_
-# A __bss_start
-# A _edata
-# A _end
-# T _fini
-# T _init
-# no need to list A symbols in $default_symbols
-
-print STDERR "default_symbols: " . $default_symbols . "\n" if $debug;
-
-print STDOUT "Namespace cleanness check for " . $library . " :\n";
-
-$lib_file = "";
-if( $library =~ /\.la$/ )
-{
-    # get the real library file from .la
-    open( FILEIN, $library ) || die "Couldn't open $! !\n";
-    while( $line = <FILEIN> )
-    {
-	if( $line =~ /library_names=\'([^ ]*).*/o )
-	{
-	    $lib_file = $1;
-	}
-    }
-    close( FILEIN );
-    if( ! $lib_file )
-    {
-	print STDERR "Library file not found in .la file!\n";
-	exit 1;
-    }
-    my $libpath = $library;
-    $libpath =~ s%[^/]*$%%;
-    if(  -e $libpath . ".libs/" . $lib_file )
-    {
-	$lib_file = $libpath . ".libs/" . $lib_file;
-    }
-    else
-    {
-	$lib_file = $libpath . $lib_file;
-    }
-}
-else
-{
-    $lib_file = $library;
-}
-
-print STDERR "libfile: ". $lib_file . "\n" if $debug;
-
-$allowed_symbols .= " " . $default_symbols;
-
-sub process_symbols($\@\%\@);
-
-@wildcards = ();
-%exacts = ();
-@regwildcards = ();
-process_symbols( $allowed_symbols, @wildcards, %exacts, @regwildcards );
-@weak_wildcards = ();
-%weak_exacts = ();
-@weak_regwildcards = ();
-process_symbols( $allowed_weak, @weak_wildcards, %weak_exacts, @weak_regwildcards );
-
-# grep is for stripping not exported symbols, which don't have address (=first column)
-$nm_command = "nm -BDCg " . $lib_file . " | grep -v '^ ' |";
-
-# TODO how portable is this nmcheck stuff?
-
-print STDERR "nm command:" . $nm_command . "\n" if $debug;
-
-open( FILEIN, $nm_command ) || die "nm command failed\n";
-
-my $exit_code = 0;
-
-while( $line = <FILEIN> )
-{
-    my $type;
-    my $symbol;
-    if( $line =~ /^[^ ]* (.) (.*)$/o )
-    {
-	$type = $1;
-	$symbol = $2;
-    }
-    else
-    {
-	die "Invalid line: " . $line . "\n";
-    }
-    
-    print STDERR "Type: " . $type . " , symbol: " . $symbol . "\n" if $debug;
-    if( $type eq "A" )
-    { # these should be system symbols, so ignore them
-	next;
-    }
-
-    my $orig_symbol = $symbol;
-
-    if( $symbol =~ /\(anonymous namespace\)/o )
-    { # TODO tell to prefer named namespaces? (shorter symbols)
-	next;
-    }
-
-    # strip prefixes
-    # the :: appending is to make "CLASS::*" work also for "vtable for CLASS"
-    $symbol =~ s/^typeinfo for (.*)$/$1::/o;
-    $symbol =~ s/^typeinfo fn for (.*)$/$1::/o;
-    $symbol =~ s/^typeinfo name for (.*)$/$1::/o;
-    $symbol =~ s/^vtable for (.*)$/$1::/o;
-    $symbol =~ s/^guard variable for (.*)$/$1::/o;
-    $symbol =~ s/^reference temporary for (.*)$/$1::/o;
-    $symbol =~ s/^VTT for (.*)$/$1::/o;
-    $symbol =~ s/^virtual thunk \[[^\]]*\] to (.*)$/$1::/o;
-    $symbol =~ s/^non-virtual thunk \[[^\]]*\] to (.*)$/$1::/o;
-    $symbol =~ s/^covariant return thunk \[[^\]]*\] to (.*)$/$1::/o;
-    $symbol =~ s/^construction vtable thunk for (.*)$/$1::/o;
-    $symbol =~ s/^construction vtable for .*-in-(.*) [0-9]*$/$1::/o;
-
-    # templates seem to have also return types mangled in their name, and nm prints it too
-    # they have also template arguments in the symbol
-    # get rid of both of those
-    while( $symbol =~ /<.*>/o )
-    {
-        $symbol =~ s/<[^<>]*>//o; # strip innermost <>
-    }
-    if( $symbol !~ /operator\(\)/o )
-    {
-	$symbol =~ s/ ?\(.*\).*$//o;  # strip () and all after it
-    }
-    else
-    {
-	$symbol =~ s/(^|:| )operator\(\) ?\(.*\).*$//o;  # strip () and all after it
-    }
-    $symbol =~ s/\[.*\] *$//o;   # strip [in-charge] etc.
-    if( $symbol =~ /(^|:| )operator /o )
-    {
-	$symbol =~ s/.* ([^\s]*)operator /$1/o; # strip everything before 'X::operator blah'
-    }
-    else
-    {
-	$symbol =~ s/.* ([^\s]+) *$/$1/o;  # get last word (strip return type)
-    }
-
-    # print STDERR "Processed symbol: " . $symbol . "\n" if $debug;
-    
-    my $found = 0;
-    if( $exacts{ $symbol } )
-    {
-	$found = 1;
-    }
-    if( ! $found )
-    {
-	for my $wild ( @wildcards )
-	{
-	    if( index( $symbol, $wild ) == 0 )
-	    {
-		$found = 1;
-		last;
-	    }
-	}
-    }
-    if( ! $found )
-    {
-	for my $wild ( @regwildcards )
-	{
-	    if( $symbol =~ /^$wild$/ )
-	    {
-		$found = 1;
-		last;
-	    }
-	}
-    }
-    if( ( ! $found ) && ( $type eq "W" || $type eq "V" ))
-    {
-	if( $weak_exacts{ $symbol } )
-	{
-	    $found = 1;
-	}
-	if( ! $found )
-	{
-	    for my $wild ( @weak_wildcards )
-	    {
-	        if( index( $symbol, $wild ) == 0 )
-	        {
-	    	    $found = 1;
-		    last;
-		}
-	    }
-	}
-	if( ! $found )
-	{
-	    for my $wild ( @weak_regwildcards )
-	    {
-	        if( $symbol =~ /^$wild$/ )
-	        {
-		    $found = 1;
-		    last;
-	        }
-	    }
-	}
-    }
-
-    if( ! $found )
-    {
-	print STDERR "Public symbol " . $orig_symbol . " is not allowed!\n";
-	$exit_code = 1;
-    }
-}
-
-close( FILEIN );
-
-print STDOUT $exit_code == 0 ? "OK\n" : "FAILED\n";
-
-exit $exit_code;
-
-sub process_symbols($\@\%\@)
-{
-    my $allowed_symbols = $_[ 0 ];
-    my $wildcards_ref = $_[ 1 ];
-    my $exacts_ref = $_[ 2 ];
-    my $regwildcards_ref = $_[ 3 ];
-    
-    $allowed_symbols =~ s/^ *//o;  # strip whitespace
-    $allowed_symbols =~ s/ *$//o;
-
-    if( $allowed_symbols eq "NONE" )
-    {
-	$allowed_symbols = "";
-    }
-
-    my @symbols1 = split( ' ', $allowed_symbols );
-    my $i = 0;
-    my @symbols2 = ();
-    while( defined( $symbols1[ $i ] ))
-    {
-	my $symbol = $symbols1[ $i ];
-	if( $symbol =~ /\./ )  # dot in name -> file
-	{
-	    open( SYMIN, $symbol ) || die ( "Cannot open file " . $symbol . "!" );
-	    while( $line = <SYMIN> )
-	    {
-		$line =~ s/^\s*//o;  # strip whitespace
-		$line =~ s/\s*$//o;
-		if( $line !~ /^$/o  # empty line
-		    &&  $line !~ /^\s*#/ ) # comment line starting with #
-		{
-		    $symbols2[ $#symbols2 + 1 ] = $line;
-		}
-	    }
-	    close( SYMIN );
-	}
-	else
-	{
-	    $symbols2[ $#symbols2 + 1 ] = $symbol;
-	}
-	$i++;
-    }
-    $i = 0;
-    while( defined( $symbols2[ $i ] ))
-    {
-	my $symbol = $symbols2[ $i ];
-	if( $symbol =~ /__/
-	    || $symbol =~ /^_[A-Z]/ )
-	{ # ISO C++ 2.10.2
-	    die "Symbols containing a double underscore or beginning with an underscore and an upper-case letter are reserved!\n";
-	}
-	elsif( $symbol eq "main"
-	    || $symbol eq "main*" )
-	{
-	    die "Symbol main is not allowed!\n";
-	}
-	if( $symbol =~ /^([^\*]*)\*$/o   # trailing * without any * before it
-	    && $symbol !~ /operator\*$/o )
-        {
-	    print STDERR "wildcard:" . $symbol . "\n" if $debug;
-    	    $wildcards_ref->[ $#{$wildcards_ref} + 1 ] = $1;
-	}
-	elsif( $symbol =~ /\*$/o
-	    && ( $symbol =~ /\*::/o || $symbol =~ /::\*/o )
-	    && $symbol !~ /^\*/o
-	    && $symbol !~ /operator\*$/o )
-	{
-	    print STDERR "regwildcard:" . $symbol . "\n" if $debug;
-	    $symbol =~ s/\*/\.\*/go;  # change * to .* (regexp)
-	    $regwildcards_ref->[ $#{$regwildcards_ref} + 1 ] = $symbol;
-	}
-	else
-	{
-	    print STDERR "exact:" . $symbol . "\n" if $debug;
-	    $exacts_ref->{ $symbol } = 1;
-	}
-	$i++;
-    }
-}
diff --git a/admin/ylwrap b/admin/ylwrap
deleted file mode 100755
index 5ea68e4..0000000
--- a/admin/ylwrap
+++ /dev/null
@@ -1,143 +0,0 @@
-#! /bin/sh
-# ylwrap - wrapper for lex/yacc invocations.
-# Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, 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.
-
-# Usage:
-#     ylwrap INPUT [OUTPUT DESIRED]... -- PROGRAM [ARGS]...
-# * INPUT is the input file
-# * OUTPUT is file PROG generates
-# * DESIRED is file we actually want
-# * PROGRAM is program to run
-# * ARGS are passed to PROG
-# Any number of OUTPUT,DESIRED pairs may be used.
-
-# The input.
-input="$1"
-shift
-case "$input" in
- [\\/]* | ?:[\\/]*)
-    # Absolute path; do nothing.
-    ;;
- *)
-    # Relative path.  Make it absolute.
-    input="`pwd`/$input"
-    ;;
-esac
-
-# The directory holding the input.
-input_dir=`echo "$input" | sed -e 's,\([\\/]\)[^\\/]*$,\1,'`
-# Quote $INPUT_DIR so we can use it in a regexp.
-# FIXME: really we should care about more than `.' and `\'.
-input_rx=`echo "$input_dir" | sed -e 's,\\\\,\\\\\\\\,g' -e 's,\\.,\\\\.,g'`
-
-echo "got $input_rx"
-
-pairlist=
-while test "$#" -ne 0; do
-   if test "$1" = "--"; then
-      shift
-      break
-   fi
-   pairlist="$pairlist $1"
-   shift
-done
-
-# The program to run.
-prog="$1"
-shift
-# Make any relative path in $prog absolute.
-case "$prog" in
- [\\/]* | ?:[\\/]*) ;;
- *[\\/]*) prog="`pwd`/$prog" ;;
-esac
-
-# FIXME: add hostname here for parallel makes that run commands on
-# other machines.  But that might take us over the 14-char limit.
-dirname=ylwrap$$
-trap "cd `pwd`; rm -rf $dirname > /dev/null 2>&1" 1 2 3 15
-mkdir $dirname || exit 1
-
-cd $dirname
-
-$prog ${1+"$@"} "$input"
-status=$?
-
-if test $status -eq 0; then
-   set X $pairlist
-   shift
-   first=yes
-   # Since DOS filename conventions don't allow two dots,
-   # the DOS version of Bison writes out y_tab.c instead of y.tab.c
-   # and y_tab.h instead of y.tab.h. Test to see if this is the case.
-   y_tab_nodot="no"
-   if test -f y_tab.c || test -f y_tab.h; then
-      y_tab_nodot="yes"
-   fi
-
-   while test "$#" -ne 0; do
-      from="$1"
-      # Handle y_tab.c and y_tab.h output by DOS
-      if test $y_tab_nodot = "yes"; then
-	 if test $from = "y.tab.c"; then
-	    from="y_tab.c"
-	 else
-	    if test $from = "y.tab.h"; then
-	       from="y_tab.h"
-	    fi
-	 fi
-      fi
-      if test -f "$from"; then
-         # If $2 is an absolute path name, then just use that,
-         # otherwise prepend `../'.
-         case "$2" in
-	   [\\/]* | ?:[\\/]*) target="$2";;
-	   *) target="../$2";;
-	 esac
-
-	 # Edit out `#line' or `#' directives.  We don't want the
-	 # resulting debug information to point at an absolute srcdir;
-	 # it is better for it to just mention the .y file with no
-	 # path.
-	 sed -e "/^#/ s,$input_rx,," "$from" > "$target" || status=$?
-      else
-	 # A missing file is only an error for the first file.  This
-	 # is a blatant hack to let us support using "yacc -d".  If -d
-	 # is not specified, we don't want an error when the header
-	 # file is "missing".
-	 if test $first = yes; then
-	    status=1
-	 fi
-      fi
-      shift
-      shift
-      first=no
-   done
-else
-   status=$?
-fi
-
-# Remove the directory.
-cd ..
-rm -rf $dirname
-
-exit $status
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index c666b57..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-make -f Makefile.cvs
diff --git a/bibletime-1.5.tar.bz2 b/bibletime-1.5.tar.bz2
new file mode 100644
index 0000000..7cd1310
--- /dev/null
+++ b/bibletime-1.5.tar.bz2
diff --git a/bibletime.desktop b/bibletime.desktop
deleted file mode 100644
index cd96b95..0000000
--- a/bibletime.desktop
+++ /dev/null
@@ -1,24 +0,0 @@
-[Desktop Entry]
-Comment=An easy to use bible study tool
-Comment[C]=An easy to use bible study tool
-Comment[cs]=Snadno pouiteln n�troj pro studium Bible
-Comment[da]=Et letanvendeligt bibelstudieprogram
-Comment[de]=Ein einfach zu benutzendes Bibelprogramm
-Comment[fr]=Un outil d'�ude biblique facile �utiliser
-Exec=bibletime
-Icon=bibletime.png
-MimeType=
-Name=BibleTime 1.4.1
-Name[C]=BibleTime 1.4.1
-Name[cs]=BibleTime 1.4.1
-Name[da]=Bibeltime 1.4.1
-Name[de]=BibleTime 1.4.1
-Name[fr]=BibleTime 1.4.1
-SwallowExec=
-SwallowTitle=
-Terminal=false
-TerminalOptions=
-Type=Application
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-DocPath=bibletime/handbook/index.html
diff --git a/bibletime.desktop.in b/bibletime.desktop.in
deleted file mode 100644
index 49f0bae..0000000
--- a/bibletime.desktop.in
+++ /dev/null
@@ -1,24 +0,0 @@
-[Desktop Entry]
-Comment=An easy to use bible study tool
-Comment[C]=An easy to use bible study tool
-Comment[cs]=Snadno pouiteln n�troj pro studium Bible
-Comment[da]=Et letanvendeligt bibelstudieprogram
-Comment[de]=Ein einfach zu benutzendes Bibelprogramm
-Comment[fr]=Un outil d'�ude biblique facile �utiliser
-Exec=bibletime
-Icon=bibletime.png
-MimeType=
-Name=BibleTime @VERSION@
-Name[C]=BibleTime @VERSION@
-Name[cs]=BibleTime @VERSION@
-Name[da]=Bibeltime @VERSION@
-Name[de]=BibleTime @VERSION@
-Name[fr]=BibleTime @VERSION@
-SwallowExec=
-SwallowTitle=
-Terminal=false
-TerminalOptions=
-Type=Application
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-DocPath=bibletime/handbook/index.html
diff --git a/bibletime.kdevprj b/bibletime.kdevprj
deleted file mode 100644
index e07769e..0000000
--- a/bibletime.kdevprj
+++ /dev/null
@@ -1,1427 +0,0 @@
-[COPYING]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[CVS/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[ChangeLog]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[Config for BinMakefileAm]
-addcxxflags=
-bin_program=bibletime
-cflags=
-cppflags=
-cxxflags=\s-O2 -Wall
-ldadd=-lpthread -lkfile -lkdeui -lkdecore -lqt -lXext -lX11
-ldflags=\s                   \s
-libtool_dir=
-path_to_bin_program=bibletime
-
-[General]
-AMChanged=false
-author=The BibleTime team
-configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux\s
-debug_args=--debug --nocrashhandler
-dir_where_make_will_be_called=./
-email=info@bibletime.info
-execute_args=--debug --ignore-session
-kdevprj_version=1.3
-lfv_open_groups=Ressource files
-make_options=\s-j1
-makefiles=bibletime/backend/sword_backend/Makefile.am,bibletime/backend/Makefile.am,bibletime/Makefile.am,bibletime/frontend/Makefile.am,bibletime/frontend/presenters/Makefile.am,bibletime/frontend/groupmanager/Makefile.am,bibletime/frontend/optionsdialog/Makefile.am,bibletime/frontend/searchdialog/Makefile.am,AUTHORS.in,TODO.in,bibletime.lsm.in,bibletime.spec.in,README.in,INSTALL.in,bibletime/docs/en/helpdialog/Makefile.am,bibletime/docs/de/helpdialog/Makefile.am,bibletime/pics/lowcolor/16*16/Makefile.am,bibletime/pics/lowcolor/Makefile.am,bibletime/pics/highcolor/16*16/Makefile.am,bibletime/pics/highcolor/Makefile.am,bibletime/pics/highcolor/22*22/Makefile.am,bibletime/pics/highcolor/32*32/Makefile.am,bibletime/pics/lowcolor/32*32/Makefile.am,bibletime/pics/lowcolor/22*22/Makefile.am,bibletime/pics/highcolor/48*48/Makefile.am,doc/Makefile.am,bibletime/printing/Makefile.am,bibletime/docs/sk/Makefile.am,bibletime/libhtmlparse/Makefile.am,bibletime/frontend/keychooser/Makefile.am,bibletime/xml/Makefile.am,README,INSTALL,bibletime.lsm,AUTHORS,TODO,bibletime.spec,admin/Makefile.am,bibletime/docs/Makefile.am,bibletime/docs/en/Makefile.am,po/Makefile.am,bibletime/docs/de/Makefile.am,bibletime/pics/Makefile.am,Makefile.am,bibletime/docs/development/Makefile.am,bibletime/frontend/thirdparty/Makefile.am,bibletime/docs/en/handbook/Makefile.am,bibletime/docs/en/handbook/common/Makefile.am,bibletime/frontend/thirdparty/qt3stuff/Makefile.am,bibletime/util/Makefile.am,bibletime/frontend/display/Makefile.am,bibletime/frontend/displaywindow/Makefile.am,bibletime/frontend/mainindex/Makefile.am,setupwizard/Makefile.am
-modifyMakefiles=false
-project_name=BibleTime
-project_type=normal_empty
-sgml_file=/home/joachim/BibleTime/bibletime-2/bibletime/docs/de/index.sgml
-short_info=
-showNonProjectFiles=true
-sub_dir=bibletime/
-version=1.3
-version_control=CVS
-workspace=1
-
-[INSTALL]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[INSTALL.in]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[KPP]
-kpp_appgrp=Applications
-kpp_bldroot=
-kpp_icon=0
-kpp_license=5
-kpp_summary=
-kpp_url=http://www.bibletime.de/
-kpp_version=1.3
-
-[LFV Groups]
-Andere=*,
-Dialogs=*.kdevdlg,
-GNU=AUTHORS.in,COPYING,ChangeLog,INSTALL.in,README.in,TODO.in,NEWS.in,bibletime.lsm.in,bibletime.spec.in,bibletime.desktop.in,
-Headers=*.h,*.hxx,*.hpp,*.H,
-Icons=*.png,
-Images=*.jpg,*.gif,
-Others=*,
-Ressource files=*.rc,
-Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l,
-groups=Ressource files,Icons,Images,Headers,Sources,Dialogs,GNU,Others
-
-[Makefile.am]
-files=
-sub_dirs=bibletime,po,admin,doc,CVS,setupwizard
-type=normal
-
-[Makefile.cvs]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[NEWS]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[NEWS.in]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[README]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[README.in]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[TODO]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[TODO.in]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[Workspace_1]
-browser_file=file:/opt/kde/share/doc/srcdoc.kde2/kdeui/kjanuswidget_h.html
-cpp_file=/home/joachim/BibleTime/bibletime-2/bibletime/main.cpp
-show_outputview=true
-show_treeview=true
-
-[admin/Makefile.am]
-files=admin/acinclude.m4.in,admin/missing,admin/ylwrap,admin/mkinstalldirs,admin/ltmain.sh,admin/config.sub,admin/config.pl,admin/config.guess,admin/conf.change.pl,admin/libtool.m4.in,admin/install-sh,admin/debianrules,admin/depcomp,admin/ltconfig
-type=HEADER
-
-[admin/acinclude.m4.in]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/conf.change.pl]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/config.guess]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/config.pl]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/config.sub]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/configure.in.min]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/debianrules]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/depcomp]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/install-sh]
-dist=false
-install=false
-install_location=
-type=DATA
-
-[admin/libtool.m4.in]
-dist=true
-install=false
-install_location=$$$$(kde_htmldir)/de/bibletime/tipdatabase
-type=DATA
-
-[admin/ltconfig]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/ltmain.sh]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/missing]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/mkinstalldirs]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[admin/ylwrap]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime.desktop]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime.desktop.in]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime.kdevprj]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime.lsm]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime.lsm.in]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime.spec]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime.spec.in]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibletime/Makefile.am]
-files=bibletime/main.cpp,bibletime/bibletime.cpp,bibletime/bibletime.h,bibletime/bibletime_slots.cpp,bibletime/bibletime_init.cpp,bibletime/bibletimeapp.cpp,bibletime/bibletimeapp.h
-sub_dirs=backend,frontend,pics,docs,xml,printing,libhtmlparse,util
-type=prog_main
-
-[bibletime/backend/Makefile.am]
-files=bibletime/backend/ckey.h,bibletime/backend/cswordbackend.cpp,bibletime/backend/cswordbackend.h,bibletime/backend/cswordbiblemoduleinfo.cpp,bibletime/backend/cswordbiblemoduleinfo.h,bibletime/backend/cswordcommentarymoduleinfo.cpp,bibletime/backend/cswordcommentarymoduleinfo.h,bibletime/backend/cswordkey.cpp,bibletime/backend/cswordkey.h,bibletime/backend/cswordldkey.cpp,bibletime/backend/cswordldkey.h,bibletime/backend/cswordlexiconmoduleinfo.cpp,bibletime/backend/cswordlexiconmoduleinfo.h,bibletime/backend/cswordmoduleinfo.cpp,bibletime/backend/cswordmoduleinfo.h,bibletime/backend/cswordmodulesearch.cpp,bibletime/backend/cswordmodulesearch.h,bibletime/backend/cswordversekey.cpp,bibletime/backend/cswordversekey.h,bibletime/backend/creferencemanager.cpp,bibletime/backend/creferencemanager.h,bibletime/backend/bt_gbfhtml.cpp,bibletime/backend/bt_gbfhtml.h,bibletime/backend/bt_thmlhtml.cpp,bibletime/backend/bt_thmlhtml.h,bibletime/backend/cswordtreekey.h,bibletime/backend/cswordtreekey.cpp,bibletime/backend/cswordbookmoduleinfo.h,bibletime/backend/cswordbookmoduleinfo.cpp,bibletime/backend/centrydisplay.cpp,bibletime/backend/centrydisplay.h,bibletime/backend/clanguagemgr.cpp,bibletime/backend/clanguagemgr.h,bibletime/backend/bt_osishtml.cpp,bibletime/backend/bt_osishtml.h,bibletime/backend/cfiltertool.cpp,bibletime/backend/cfiltertool.h
-sub_dirs=sword_backend,
-type=shared_library
-
-[bibletime/backend/bt_gbfhtml.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/bt_gbfhtml.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/bt_osishtml.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/bt_osishtml.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/bt_thmlhtml.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/bt_thmlhtml.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/centrydisplay.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/centrydisplay.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/cfiltertool.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/cfiltertool.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/ckey.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/clanguagemgr.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/clanguagemgr.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/creferencemanager.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/creferencemanager.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/cswordbackend.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/cswordbackend.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/cswordbiblemoduleinfo.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/cswordbiblemoduleinfo.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/cswordbookmoduleinfo.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/cswordbookmoduleinfo.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/cswordcommentarymoduleinfo.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/cswordcommentarymoduleinfo.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/cswordkey.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/cswordkey.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/cswordldkey.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/cswordldkey.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/cswordlexiconmoduleinfo.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/cswordlexiconmoduleinfo.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/cswordmoduleinfo.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/cswordmoduleinfo.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/cswordmodulesearch.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/cswordmodulesearch.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/cswordtreekey.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/cswordtreekey.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/cswordversekey.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/backend/cswordversekey.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/backend/sword_backend/Makefile.am]
-files=
-sub_dirs=
-type=shared_library
-
-[bibletime/bibletime.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/bibletime.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/bibletime_init.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/bibletime_slots.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/bibletimeapp.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/bibletimeapp.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/docs/Makefile.am]
-files=
-sub_dirs=en,de,sk,development
-type=normal
-
-[bibletime/docs/de/Makefile.am]
-files=
-sub_dirs=helpdialog,
-type=normal
-
-[bibletime/docs/de/helpdialog/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[bibletime/docs/development/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[bibletime/docs/en/Makefile.am]
-files=
-sub_dirs=helpdialog,handbook
-type=normal
-
-[bibletime/docs/en/handbook/Makefile.am]
-files=
-sub_dirs=common
-type=normal
-
-[bibletime/docs/en/handbook/common/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[bibletime/docs/en/helpdialog/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[bibletime/docs/sk/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[bibletime/frontend/Makefile.am]
-files=bibletime/frontend/cmdiarea.cpp,bibletime/frontend/cmdiarea.h,bibletime/frontend/chtmldialog.cpp,bibletime/frontend/chtmldialog.h,bibletime/frontend/kstartuplogo.h,bibletime/frontend/kstartuplogo.cpp,bibletime/frontend/cinputdialog.cpp,bibletime/frontend/cinputdialog.h,bibletime/frontend/cprofilemgr.cpp,bibletime/frontend/cprofilemgr.h,bibletime/frontend/cprofile.cpp,bibletime/frontend/cprofile.h,bibletime/frontend/cprofilewindow.cpp,bibletime/frontend/cprofilewindow.h,bibletime/frontend/cbtconfig.cpp,bibletime/frontend/cbtconfig.h,bibletime/frontend/coptionsdialog.cpp,bibletime/frontend/coptionsdialog.h,bibletime/frontend/cpointers.h,bibletime/frontend/cexportmanager.cpp,bibletime/frontend/cexportmanager.h,bibletime/frontend/ctooltipmanager.cpp,bibletime/frontend/ctooltipmanager.h,bibletime/frontend/ctooltip.cpp,bibletime/frontend/ctooltip.h,bibletime/frontend/cdragdropmgr.cpp,bibletime/frontend/cdragdropmgr.h,bibletime/frontend/cswordsetupdialog.cpp,bibletime/frontend/cswordsetupdialog.h,bibletime/frontend/btinstallmgr.cpp,bibletime/frontend/btinstallmgr.h
-sub_dirs=groupmanager,presenters,optionsdialog,searchdialog,keychooser,thirdparty,display,displaywindow,mainindex
-type=static_library
-
-[bibletime/frontend/btinstallmgr.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/btinstallmgr.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/cbtconfig.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/cbtconfig.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/cdragdropmgr.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/cdragdropmgr.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/cexportmanager.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/cexportmanager.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/chtmldialog.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/chtmldialog.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/cinputdialog.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/cinputdialog.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/cmdiarea.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/cmdiarea.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/coptionsdialog.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/coptionsdialog.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/cpointers.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/cprofile.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/cprofile.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/cprofilemgr.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/cprofilemgr.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/cprofilewindow.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/cprofilewindow.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/cswordsetupdialog.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/cswordsetupdialog.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/ctooltip.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/ctooltip.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/ctooltipmanager.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/ctooltipmanager.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/display/Makefile.am]
-files=bibletime/frontend/display/cdisplay.cpp,bibletime/frontend/display/cdisplay.h,bibletime/frontend/display/chtmlreaddisplay.cpp,bibletime/frontend/display/chtmlreaddisplay.h,bibletime/frontend/display/cwritedisplay.cpp,bibletime/frontend/display/cwritedisplay.h,bibletime/frontend/display/creaddisplay.cpp,bibletime/frontend/display/creaddisplay.h,bibletime/frontend/display/cplainwritedisplay.cpp,bibletime/frontend/display/cplainwritedisplay.h,bibletime/frontend/display/chtmlwritedisplay.cpp,bibletime/frontend/display/chtmlwritedisplay.h
-type=static_library
-
-[bibletime/frontend/display/cdisplay.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/display/cdisplay.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/display/chtmlreaddisplay.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/display/chtmlreaddisplay.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/display/chtmlwritedisplay.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/display/chtmlwritedisplay.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/display/cplainwritedisplay.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/display/cplainwritedisplay.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/display/creaddisplay.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/display/creaddisplay.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/display/cwritedisplay.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/display/cwritedisplay.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/displaywindow/Makefile.am]
-files=bibletime/frontend/displaywindow/cbiblereadwindow.cpp,bibletime/frontend/displaywindow/cbiblereadwindow.h,bibletime/frontend/displaywindow/cbuttons.cpp,bibletime/frontend/displaywindow/cbuttons.h,bibletime/frontend/displaywindow/cdisplaywindow.cpp,bibletime/frontend/displaywindow/cdisplaywindow.h,bibletime/frontend/displaywindow/clexiconreadwindow.cpp,bibletime/frontend/displaywindow/clexiconreadwindow.h,bibletime/frontend/displaywindow/cmodulechooserbar.h,bibletime/frontend/displaywindow/cmodulechooserbar.cpp,bibletime/frontend/displaywindow/cbookreadwindow.cpp,bibletime/frontend/displaywindow/cbookreadwindow.h,bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp,bibletime/frontend/displaywindow/ccommentaryreadwindow.h,bibletime/frontend/displaywindow/cmodulechooserbutton.cpp,bibletime/frontend/displaywindow/cmodulechooserbutton.h,bibletime/frontend/displaywindow/creadwindow.cpp,bibletime/frontend/displaywindow/creadwindow.h,bibletime/frontend/displaywindow/cwritewindow.cpp,bibletime/frontend/displaywindow/cwritewindow.h,bibletime/frontend/displaywindow/cplainwritewindow.cpp,bibletime/frontend/displaywindow/cplainwritewindow.h,bibletime/frontend/displaywindow/chtmlwritewindow.cpp,bibletime/frontend/displaywindow/chtmlwritewindow.h
-type=static_library
-
-[bibletime/frontend/displaywindow/cbiblereadwindow.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/displaywindow/cbiblereadwindow.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/displaywindow/cbookreadwindow.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/displaywindow/cbookreadwindow.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/displaywindow/cbuttons.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/displaywindow/cbuttons.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/displaywindow/ccommentaryreadwindow.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/displaywindow/cdisplaywindow.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/displaywindow/cdisplaywindow.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/displaywindow/chtmlwritewindow.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/displaywindow/chtmlwritewindow.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/displaywindow/clexiconreadwindow.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/displaywindow/clexiconreadwindow.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/displaywindow/cmodulechooserbar.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/displaywindow/cmodulechooserbar.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/displaywindow/cmodulechooserbutton.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/displaywindow/cmodulechooserbutton.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/displaywindow/cplainwritewindow.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/displaywindow/cplainwritewindow.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/displaywindow/creadwindow.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/displaywindow/creadwindow.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/displaywindow/cwritewindow.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/displaywindow/cwritewindow.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/groupmanager/Makefile.am]
-files=
-sub_dirs=
-type=static_library
-
-[bibletime/frontend/keychooser/Makefile.am]
-files=bibletime/frontend/keychooser/ckeychooserwidget.cpp,bibletime/frontend/keychooser/ckeychooserwidget.h,bibletime/frontend/keychooser/cfx_btn.cpp,bibletime/frontend/keychooser/cfx_btn.h,bibletime/frontend/keychooser/ckeychooser.cpp,bibletime/frontend/keychooser/ckeychooser.h,bibletime/frontend/keychooser/clexiconkeychooser.cpp,bibletime/frontend/keychooser/clexiconkeychooser.h,bibletime/frontend/keychooser/cbiblekeychooser.cpp,bibletime/frontend/keychooser/cbiblekeychooser.h,bibletime/frontend/keychooser/cbookkeychooser.cpp,bibletime/frontend/keychooser/cbookkeychooser.h,bibletime/frontend/keychooser/cbooktreechooser.cpp,bibletime/frontend/keychooser/cbooktreechooser.h
-sub_dirs=
-type=static_library
-
-[bibletime/frontend/keychooser/cbiblekeychooser.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/keychooser/cbiblekeychooser.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/keychooser/cbookkeychooser.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/keychooser/cbookkeychooser.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/keychooser/cbooktreechooser.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/keychooser/cbooktreechooser.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/keychooser/cfx_btn.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/keychooser/cfx_btn.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/keychooser/ckeychooser.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/keychooser/ckeychooser.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/keychooser/ckeychooserbase.cpp]
-dist=false
-install=false
-install_location=
-type=DATA
-
-[bibletime/frontend/keychooser/ckeychooserwidget.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/keychooser/ckeychooserwidget.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/keychooser/clexiconkeychooser.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/keychooser/clexiconkeychooser.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/keychooser/keychooserbase.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/kstartuplogo.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/kstartuplogo.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/mainindex/Makefile.am]
-files=bibletime/frontend/mainindex/cmainindex.cpp,bibletime/frontend/mainindex/cmainindex.h,bibletime/frontend/mainindex/cindexitem.cpp,bibletime/frontend/mainindex/cindexitem.h
-sharedlib_LDFLAGS=-version-info 0:0:0
-sharedlib_rootname=mainindex
-sub_dirs=
-type=static_library
-
-[bibletime/frontend/mainindex/cindexitem.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/mainindex/cindexitem.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/mainindex/cmainindex.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/mainindex/cmainindex.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/optionsdialog/Makefile.am]
-files=bibletime/frontend/optionsdialog/coptionsdialog.h
-sub_dirs=
-type=static_library
-
-[bibletime/frontend/optionsdialog/coptionsdialog.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/presenters/Makefile.am]
-files=bibletime/frontend/presenters/cbookpresenter.h
-sub_dirs=
-type=static_library
-
-[bibletime/frontend/presenters/cbookpresenter.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/searchdialog/Makefile.am]
-files=bibletime/frontend/searchdialog/csearchdialog.cpp,bibletime/frontend/searchdialog/csearchdialog.h,bibletime/frontend/searchdialog/csearchdialogpages.cpp,bibletime/frontend/searchdialog/csearchdialogpages.h
-type=static_library
-
-[bibletime/frontend/searchdialog/csearchdialog.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/searchdialog/csearchdialog.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/frontend/searchdialog/csearchdialogpages.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/frontend/searchdialog/csearchdialogpages.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/libhtmlparse/Makefile.am]
-files=
-sub_dirs=
-type=static_library
-
-[bibletime/main.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/pics/Makefile.am]
-files=
-sub_dirs=lowcolor,highcolor,
-type=normal
-
-[bibletime/pics/highcolor/16*16/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[bibletime/pics/highcolor/22*22/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[bibletime/pics/highcolor/32*32/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[bibletime/pics/highcolor/48*48/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[bibletime/pics/highcolor/Makefile.am]
-sub_dirs=16*16,22*22,32*32,48*48,
-type=normal
-
-[bibletime/pics/lowcolor/16*16/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[bibletime/pics/lowcolor/22*22/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[bibletime/pics/lowcolor/32*32/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[bibletime/pics/lowcolor/Makefile.am]
-sub_dirs=16*16,32*32,22*22,
-type=normal
-
-[bibletime/printing/Makefile.am]
-files=bibletime/printing/cprinter.cpp,bibletime/printing/cprinter.h,bibletime/printing/cstyleeditordialog.cpp,bibletime/printing/cstyleeditordialog.h,bibletime/printing/cstyle.cpp,bibletime/printing/cstyle.h,bibletime/printing/cprintitem.cpp,bibletime/printing/cprintitem.h,bibletime/printing/cprintitemlist.cpp,bibletime/printing/cprintitemlist.h,bibletime/printing/cstylelist.cpp,bibletime/printing/cstylelist.h,bibletime/printing/cprintdialogpages.cpp,bibletime/printing/cprintdialogpages.h
-sub_dirs=
-type=static_library
-
-[bibletime/printing/cprintdialogpages.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/printing/cprintdialogpages.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/printing/cprinter.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/printing/cprinter.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/printing/cprintitem.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/printing/cprintitem.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/printing/cprintitemlist.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/printing/cprintitemlist.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/printing/cstyle.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/printing/cstyle.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/printing/cstyleeditordialog.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/printing/cstyleeditordialog.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/printing/cstylelist.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/printing/cstylelist.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/util/Makefile.am]
-files=bibletime/util/scoped_resource.h,bibletime/util/cpointers.cpp,bibletime/util/cpointers.h,bibletime/util/ctoolclass.cpp,bibletime/util/ctoolclass.h,bibletime/util/cresmgr.cpp,bibletime/util/cresmgr.h
-sub_dirs=
-type=static_library
-
-[bibletime/util/cpointers.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/util/cpointers.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/util/cresmgr.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/util/cresmgr.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/util/ctoolclass.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibletime/util/ctoolclass.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/util/scoped_resource.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibletime/xml/Makefile.am]
-files=bibletime/xml/bibletimeui.rc,
-sub_dirs=
-type=normal
-
-[bibletime/xml/bibletimeui.rc]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[configure.in]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[configure.in.in]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[doc/Makefile.am]
-files=
-sub_dirs=
-type=normal
-
-[po/Makefile.am]
-files=
-sub_dirs=
-type=po
-
-[setupwizard/Makefile.am]
-files=
-sharedlib_LDFLAGS=-version-info 0:0:0
-sharedlib_rootname=setupwizard
-sub_dirs=
-type=static_library
diff --git a/bibletime.lsm b/bibletime.lsm
deleted file mode 100644
index 9834dec..0000000
--- a/bibletime.lsm
+++ /dev/null
@@ -1,14 +0,0 @@
-Begin3
-Title: BibleTime
-Version: 1.4.1
-Entered-date:  31DEC2003
-Description: An easy to use but powerful Bible study tool for KDE 3. BibleTime is based on SWORD 1.5.6.
-Keywords: bible,study,KDE3,KDE,QT,sword,bibletime,bibletime2,crosswire,www.bibletime.info,crosswire.org
-Author: The BibleTime Team <Info@bibletime.info>
-Maintained-by: The BibleTime Team <Info@bibletime.info>
-Primary-site: http://www.bibletime.info/
-Home-page: http://www.bibletime.info/
-Original-site: http://www.bibletime.info/
-Platforms: Linux and other Unices
-Copying-policy: GNU Public License
-End
diff --git a/bibletime.lsm.in b/bibletime.lsm.in
deleted file mode 100644
index 3ee872b..0000000
--- a/bibletime.lsm.in
+++ /dev/null
@@ -1,14 +0,0 @@
-Begin3
-Title: BibleTime
-Version: @VERSION@
-Entered-date:  31DEC2003
-Description: An easy to use but powerful Bible study tool for KDE 3. BibleTime is based on SWORD 1.5.6.
-Keywords: bible,study,KDE3,KDE,QT,sword,bibletime,bibletime2,crosswire,www.bibletime.info,crosswire.org
-Author: The BibleTime Team <Info@bibletime.info>
-Maintained-by: The BibleTime Team <Info@bibletime.info>
-Primary-site: http://www.bibletime.info/
-Home-page: http://www.bibletime.info/
-Original-site: http://www.bibletime.info/
-Platforms: Linux and other Unices
-Copying-policy: GNU Public License
-End
diff --git a/bibletime.m4 b/bibletime.m4
deleted file mode 100644
index 3f42937..0000000
--- a/bibletime.m4
+++ /dev/null
@@ -1,193 +0,0 @@
-##	-*- autoconf -*-
-
-dnl -------------------------------------------------------------------------------
-dnl		Check wheter to use static linking, first parameter is the result (YES/NO)
-dnl -------------------------------------------------------------------------------
-AC_DEFUN(AC_CHECK_STATIC_LINKING,
-[
-$1="NO"
-
-AC_MSG_CHECKING(whether to use static linking)
-AC_ARG_ENABLE(static-linking,
-      [  --enable-static-linking	use static linking],
-      USE_STATIC_LINKING=$enableval, USE_STATIC_LINKING="no")
-
-if test "$USE_STATIC_LINKING" = "yes"; then
-	BT_LDFLAGS="-all-static -Wl,-Bstatic";
-	AC_SUBST(BT_LDFLAGS)
-	CPPFLAGS="-DSTATIC_BUILD $CPPFLAGS";
-	$1="YES";
-else
-	$1="NO";
-fi
-
-AC_MSG_RESULT($USE_STATIC_LINKING)
-])
-
-dnl -------------------------------------------------------------------------------
-dnl		Checks the type of the distribution
-dnl		Possible names for the distributions are SuSE, RedHat, Mandrake
-dnl -------------------------------------------------------------------------------
-AC_DEFUN(AC_CHECK_DISTRIBUTION,
-[
-AC_MSG_CHECKING([for the used Linux distribution])
-
-AC_ARG_WITH(distribution,
-[  --with-distribution=TYPE     The name of your *NIX distribution, e.g. SuSE [auto] ],
-[
-  ac_distribution=$withval
-],ac_distribution=auto
-)
-
-AC_ARG_WITH(distribution-version,
-[  --with-distribution-version=VERSION     Version of your *NIX distribution, e.g. 7.2 [auto] ],
-[
-  ac_distribution_version=$withval
-],ac_distribution_version=auto
-)
-
-AC_ARG_WITH(rpm-prefix,
-[  --with-rpm-prefix=DIR    The directory which should be used as PREFIX
-														in the RPM spec file [auto] ],
-[
-  ac_rpm_prefix=$withval
-],ac_rpm_prefix=auto
-)
-
-AC_ARG_WITH(rpm-group,
-[  --with-rpm-group=DIR     The group which will be used for the RPM system [auto] ],
-[
-  ac_rpm_group=$withval
-],ac_rpm_group=auto
-)
-
-if test "$ac_distribution" != "auto"; then
-	DISTRIBUTION=[$ac_distribution]
-fi
-
-if test "$ac_distribution" = "auto"; then
-AC_CACHE_VAL(DISTRIBUTION, [
-if test -f "/etc/SuSE-release"; then
-	DISTRIBUTION="SuSE"
-elif test -f "/etc/mandrake-release"; then
-	DISTRIBUTION="Mandrake"
-elif test -f "/etc/redhat-release"; then
-	DISTRIBUTION="Red Hat"
-elif test -f "/etc/debian_version"; then
-	DISTRIBUTION="Debian"
-fi
-])
-fi
-
-if test "$ac_distribution_version" != "auto"; then
-	DISTRIBUTION_VERSION=[$ac_distribution_version]
-fi
-if test "$ac_distribution_version" = "auto"; then
-AC_CACHE_VAL(DISTRIBUTION_VERSION, [
-if test -f "/etc/SuSE-release" && test "$DISTRIBUTION" = "SuSE"; then
-	DISTRIBUTION_VERSION=[`grep "VERSION =" /etc/SuSE-release | sed 's/VERSION = //'`];	
-elif test -f "/etc/mandrake-release" && test "$DISTRIBUTION" = "Mandrake"; then
-	DISTRIBUTION_VERSION=[`grep "Mandrake" /etc/mandrake-release | sed 's/[a-zA-Z()]*//g' | awk '{print $1}'`]
-elif test -f "/etc/redhat-release" && test "$DISTRIBUTION" = "Red Hat"; then
-	DISTRIBUTION_VERSION=[`grep "Red Hat" /etc/redhat-release | sed 's/[a-zA-Z()]*//g' | awk '{print $1}'`]
-elif test -f "/etc/debian_version" && test "$DISTRIBUTION" = "Debian"; then
-	DISTRIBUTION_VERSION=[`cat /etc/debian_version`]
-fi
-])
-fi
-
-
-if test "$ac_rpm_prefix" != "auto"; then
-	RPM_PREFIX=[$ac_rpm_prefix]
-fi
-if test "$ac_rpm_prefix" = "auto"; then
-AC_CACHE_VAL(RPM_PREFIX, [
-if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_PREFIX="/opt/kde3"
-elif test "$DISTRIBUTION" = "Mandrake"; then
-	RPM_PREFIX="/usr"	
-elif test "$DISTRIBUTION" = "Red Hat"; then
-	RPM_PREFIX="/usr"		
-elif test "$DISTRIBUTION" = "Debian"; then
-	RPM_PREFIX="/usr"
-fi
-])
-fi
-
-if test "$ac_rpm_group" != "auto"; then
-	RPM_GROUP=[$ac_rpm_group]
-fi
-if test "$ac_rpm_prefix" = "auto"; then
-AC_CACHE_VAL(RPM_GROUP,
-[
-if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_GROUP="X11/KDE/Applications"
-elif test "$DISTRIBUTION" = "Mandrake"; then
-	RPM_GROUP="Graphical desktop/KDE"
-elif test "$DISTRIBUTION" = "Red Hat"; then
-	RPM_GROUP="Graphical desktop/KDE"
-elif test "$DISTRIBUTION" = "Debian"; then
-	RPM_GROUP="Graphical desktop/KDE"
-fi
-])
-fi
-
-if test -n "$DISTRIBUTION" && test "$DISTRIBUTION" != "unknown"; then
-	AC_DEFINE_UNQUOTED(DISTRIBUTION, ${DISTRIBUTION}, [The type of your distribution])
-fi
-
-if test -n "$DISTRIBUTION_VERSION"  && test "$DISTRIBUTION_VERSION" != "unknown"; then
-	AC_DEFINE_UNQUOTED(DISTRIBUTION_VERSION, ${DISTRIBUTION_VERSION}, [The version of your distribution])
-fi
-
-AC_SUBST(DISTRIBUTION)
-AC_SUBST(DISTRIBUTION_VERSION)
-AC_SUBST(RPM_PREFIX)
-AC_SUBST(RPM_GROUP)
-
-AC_MSG_RESULT([$DISTRIBUTION $DISTRIBUTION_VERSION])
-
-AC_MSG_CHECKING([for RPM installation prefix])
-AC_MSG_RESULT([$RPM_PREFIX])
-
-AC_MSG_CHECKING([for the correct RPM group])
-AC_MSG_RESULT([$RPM_GROUP])
-])
-
-
-
-
-dnl MY_CURL
-dnl -------
-dnl set my_cv_curl_vers to the version of libcurl or NONE
-dnl if libcurl is not found or is too old
-dnl This function comes from cURL's webpage
-
-AC_DEFUN(AC_CHECK_CURL,[
- AC_CACHE_VAL(my_cv_curl_vers,[
- my_cv_curl_vers=NONE
- dnl check is the plain-text version of the required version
- check="7.9"
- dnl check_hex must be UPPERCASE if any hex letters are present
- check_hex="070900"
-
- AC_MSG_CHECKING([for curl >= $check])
-
- if eval curl-config --version 2>/dev/null >/dev/null; then
-   ver=`curl-config --version | sed -e "s/libcurl //g"`
-   hex_ver=`curl-config --vernum | tr 'a-f' 'A-F'`
-   ok=`echo "ibase=16; if($hex_ver>=$check_hex) $hex_ver else 0" | bc`
-
-   if test x$ok != x0; then
-     my_cv_curl_vers="$ver"
-     AC_MSG_RESULT([$my_cv_curl_vers])
-   else
-     AC_MSG_RESULT(FAILED)
-		 AC_MSG_ERROR([$ver is too old. Please install libcurl version $check or higher.]);
-   fi
- else
-   AC_MSG_RESULT(FAILED)
-   AC_MSG_ERROR([curl-config was not found. Please install libcurl version $check or higher.])
- fi
- ])
-])
diff --git a/bibletime.spec b/bibletime.spec
deleted file mode 100644
index cfc5531..0000000
--- a/bibletime.spec
+++ /dev/null
@@ -1,233 +0,0 @@
-%define         name 		bibletime
-%define         version 	1.4.1
-
-# this needs to be changed depending on build number
-%define		release 	1
-
-# This should be set to your os.
-# Possible values are  Mandrake, Red Hat, Turbolinux, Caldera, SuSE, Debian, etc.
-# In bibletime.spec.in this is automatically filled in by configure
-%define		ostype 		SuSE
-
-# This should be set to the version of your OS (6.0, 6.1, 6.2, 7.0, 7.1, 7.2, 8.0, etc.)
-# Done by configure in bibletime.spec.in
-%define		osversion 	9.0
-
-# This is your cpu i486, i586, i686, ppc, sparc, alpha, etc.
-%define		buildarch 	i586
-
-# This the RPM group on your system that this will installed into.
-# Graphical desktop/KDE, X11/apps, etc.
-%define		rpmgroup 	X11/KDE/Applications
-
-Summary:        BibleTime %{version} is an easy to use Bible study tool for KDE.
-Name:		%{name}
-Version:        %{version}
-Release:        %{release}
-Copyright:      GPL
-Vendor:         BibleTime's developer (info@bibletime.info)
-Url:            http://www.bibletime.info/
-Packager:       Brook Humphrey <bah@webmedic.net>, Joachim Ansorg <junkmail@joachim.ansorgs.de>
-Group:          %{rpmgroup}
-BuildArch:      %{buildarch}
-Source0:        %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}--rootbibletime
-Prefix: 	/opt/kde3
-Requires:	sword >= 1.5.7
-Requires:	curl >= 7.10
-Distribution:	%{ostype} %{osversion}
-
-%description
-BibleTime %{version}-%{release} is a free and easy to use bible study tool for UNIX systems.
-
-BibleTime provides easy handling of digitalized texts (Bibles, commentaries and lexicons) and powerful features to work with these texts (search in texts, write own notes, save, print etc.). BibleTime is a frontend for the  SWORD Bible Framework.
-
-This is  a relocatable package, you can install it on different target with
-rpm -Uvh bibletime-%{version}-%{release}.rpm --prefix /usr/local/opt/apps/noncommercial
-default is %{_prefix}
-
-The SWORD Project is an effort to create an ever expanding software package for research and study of God and His Word.  The SWORD Bible Framework allows easy manipulation of Bible texts, commentaries, lexicons, dictionaries, etc.  Many frontends are build using this framework.  An installed module set may be shared between any frontend using the framework.
-
-This rpm was compiled on a %{ostype} %{osversion} system for %{buildarch} class cpu's.
-
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
-
-%setup -q
-make -f Makefile.cvs
-
-# Look for common rpm-options:
-if [ -f /etc/opt/kde3/common_options ]; then
-  . /etc/opt/kde3/common_options
-  ./configure $configkde
-else
-  ./configure --prefix=${_prefix}
-fi
-
-# Setup for parallel builds
-numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
-if [ "$numprocs" = "0" ]; then
- numprocs=1
-fi
-
-make -j$numprocs
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install-strip
-
-#cd $RPM_BUILD_ROOT
-#find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/bt-files.list
-#find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >>  $RPM_BUILD_DIR/bt-files.list
-#find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >>  $RPM_BUILD_DIR/bt-files.list
-
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%clean
-#rm -f $RPM_BUILD_DIR/master.list
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%{prefix}/bin/*
-%{prefix}/share/applnk/Applications/bibletime.desktop
-%{prefix}/share/apps/bibletime/
-%{prefix}/share/doc/HTML/en/bibletime/
-%{prefix}/share/icons/*
-
-%changelog
-* Sat Dec 27 2003 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-
--We require curl 7.10 or later now
-
--Update to BibleTime 1.4 and Sword 1.5.7
-
-* Sun Jun 22 2003 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-
--Cleanup. We require no an Sword RPM file to be installed.
-
--Removed Mandrake menu stuff because there's an own SPEC file for this.
-
-
-* Fri Feb 14 2003 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-
--Removed locales.d source and management of Sword files because we require a Sword RPM now.
-
-
-* Mon Apr 8 2002 Brook Humphrey <bah@webmedic.net> bibletime-1.1
-
-- Added to the spec to better handle mandrake menus during compile. Now should be compatable with all os's.
-
-- added locals.d source to build. This removes dependecy on sword being installed. Will make seperate package for this later.
-
-
-* Fri Mar 31 2002 Joachim Ansorg <jansorg@gmx.de>
-
-- Made including the book translations working finally.
-
-- Fixed SPEC files to work with SuSE
-
-
-* Thu Feb 7 2002 Brook Humphrey <bah@webmedic.net> bibletime-1.0.2
-
-- changed compile time options to mach bibletime spec included with source files
-
-- compiled on mandrake 8.2
-
-
-* Fri Sep 7 2001 Joachim Ansorg <jansorg@gmx.de>
-
-- Added the bookname files in the file list
-
-* Tue Jul 10 2001 Brook Humphrey <bah@webmedic.net> bibletime-1.0.1-Mandrake8.0.4mdk
-
-- Recompile because of dependecy problems.  
-
-* Tue Jul 10 2001 Brook Humphrey <bah@webmedic.net> bibletime-1.0.1-Mandrake8.0.1mdk
-
-- bug fix release bibletime-1.0.1
-
-- adda extra compile options to spec file.
-
-- Merged in suse changes for compileing on SuSE
-
-* Sun May 27 2001 Brook Humphrey <bah@webmedic.net>
-
-- Trying different variations of static compiles again.
-
-- Still using cvs sources while waiting for 1.0 release.
-
-* Thu May 24 2001 Brook Humphrey <bah@webmedic.net>
-
-- Trying for x static and whatever else we can get into it.
-
-- No X for today Got libz to compile in but it causes segfault.
-
-* Wed May 23 2001 Brook Humphrey <bah@webmedic.net>
-
-- Yet another try at static qt.
-
-- Qt static works now.
-
-* Mon May 21 2001 Brook Humphrey <bah@webmedic.net>
-
-- Static is working for kde and a few other libs but not qt yet.
-
-- Testing another patch today to try to get qt compiled static.
-
-* Sun May 20 2001 Brook Humphrey <bah@webmedic.net>
-
-- Cleaned up spec some more(stupid spelling error's)
-
-- static compile not working today so added option to compile kde and sword as static seperately
-
-* Sat May 19 2001 Brook Humphrey <bah@webmedic.net>
-
-- Cleaned up spec some more and added a few more comments
-
-- Changed spec to automaticly do parts concerning static and Mandrake menus
-
-- All info can be set in defines at top of spec file no other changes should need to be made
-
-- Fixed patch to compile static should now compile static with kde libs 
-
-- Test to compile with qt as static also
-
-* Sun May 13 2001 Brook Humphrey <bah@webmedic.net>
-
-- cleaned up spec file and added more comments for easier reading.
-
-- changed sword.conf instelation to check for previous versions of sword.conf
-
-- If found a new sword.conf is not created
-
-- Made a patch to hopefully compile kde and other libs as atatic
-
-- static compile didn't work for today.
-
-* Tue May 8 2001 Brook Humphrey <bah@webmedic.net>
-
-- Updated package to be relocatable
-
-- added sword directories and sword.conf to install
-
-* Mon Apr 30 2001 Brook Humphrey <bah@webmedic.net>
-
-- Changed to build staticly
-
-- added more mandrake macros to spec file
-
-* Mon Apr 23 2001 Brook Humphrey <bah@webmedic.net>
-
-- made changes to enable compile of cvs tree
-
-* Wed Mar 14 2001 Brook Humphrey <bah@webmedic.net>
-
-- updated to use mandrake menu sysem
-
diff --git a/bibletime.spec.in b/bibletime.spec.in
deleted file mode 100644
index 3267f9a..0000000
--- a/bibletime.spec.in
+++ /dev/null
@@ -1,233 +0,0 @@
-%define         name 		@PACKAGE@
-%define         version 	@VERSION@
-
-# this needs to be changed depending on build number
-%define		release 	1
-
-# This should be set to your os.
-# Possible values are  Mandrake, Red Hat, Turbolinux, Caldera, SuSE, Debian, etc.
-# In bibletime.spec.in this is automatically filled in by configure
-%define		ostype 		@DISTRIBUTION@
-
-# This should be set to the version of your OS (6.0, 6.1, 6.2, 7.0, 7.1, 7.2, 8.0, etc.)
-# Done by configure in bibletime.spec.in
-%define		osversion 	@DISTRIBUTION_VERSION@
-
-# This is your cpu i486, i586, i686, ppc, sparc, alpha, etc.
-%define		buildarch 	i586
-
-# This the RPM group on your system that this will installed into.
-# Graphical desktop/KDE, X11/apps, etc.
-%define		rpmgroup 	@RPM_GROUP@
-
-Summary:        BibleTime %{version} is an easy to use Bible study tool for KDE.
-Name:		%{name}
-Version:        %{version}
-Release:        %{release}
-Copyright:      GPL
-Vendor:         BibleTime's developer (info@bibletime.info)
-Url:            http://www.bibletime.info/
-Packager:       Brook Humphrey <bah@webmedic.net>, Joachim Ansorg <junkmail@joachim.ansorgs.de>
-Group:          %{rpmgroup}
-BuildArch:      %{buildarch}
-Source0:        %{name}-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}--rootbibletime
-Prefix: 	@RPM_PREFIX@
-Requires:	sword >= 1.5.7
-Requires:	curl >= 7.10
-Distribution:	%{ostype} %{osversion}
-
-%description
-BibleTime %{version}-%{release} is a free and easy to use bible study tool for UNIX systems.
-
-BibleTime provides easy handling of digitalized texts (Bibles, commentaries and lexicons) and powerful features to work with these texts (search in texts, write own notes, save, print etc.). BibleTime is a frontend for the  SWORD Bible Framework.
-
-This is  a relocatable package, you can install it on different target with
-rpm -Uvh bibletime-%{version}-%{release}.rpm --prefix /usr/local/opt/apps/noncommercial
-default is %{_prefix}
-
-The SWORD Project is an effort to create an ever expanding software package for research and study of God and His Word.  The SWORD Bible Framework allows easy manipulation of Bible texts, commentaries, lexicons, dictionaries, etc.  Many frontends are build using this framework.  An installed module set may be shared between any frontend using the framework.
-
-This rpm was compiled on a %{ostype} %{osversion} system for %{buildarch} class cpu's.
-
-
-%prep
-rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/%{name}-%{version}
-
-%setup -q
-make -f Makefile.cvs
-
-# Look for common rpm-options:
-if [ -f /etc/opt/kde3/common_options ]; then
-  . /etc/opt/kde3/common_options
-  ./configure $configkde
-else
-  ./configure --prefix=${_prefix}
-fi
-
-# Setup for parallel builds
-numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :`
-if [ "$numprocs" = "0" ]; then
- numprocs=1
-fi
-
-make -j$numprocs
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install-strip
-
-#cd $RPM_BUILD_ROOT
-#find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/bt-files.list
-#find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >>  $RPM_BUILD_DIR/bt-files.list
-#find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >>  $RPM_BUILD_DIR/bt-files.list
-
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-%clean
-#rm -f $RPM_BUILD_DIR/master.list
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%{prefix}/bin/*
-%{prefix}/share/applnk/Applications/bibletime.desktop
-%{prefix}/share/apps/bibletime/
-%{prefix}/share/doc/HTML/en/bibletime/
-%{prefix}/share/icons/*
-
-%changelog
-* Sat Dec 27 2003 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-
--We require curl 7.10 or later now
-
--Update to BibleTime 1.4 and Sword 1.5.7
-
-* Sun Jun 22 2003 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-
--Cleanup. We require no an Sword RPM file to be installed.
-
--Removed Mandrake menu stuff because there's an own SPEC file for this.
-
-
-* Fri Feb 14 2003 Joachim Ansorg <junkmail@joachim.ansorgs.de>
-
--Removed locales.d source and management of Sword files because we require a Sword RPM now.
-
-
-* Mon Apr 8 2002 Brook Humphrey <bah@webmedic.net> bibletime-1.1
-
-- Added to the spec to better handle mandrake menus during compile. Now should be compatable with all os's.
-
-- added locals.d source to build. This removes dependecy on sword being installed. Will make seperate package for this later.
-
-
-* Fri Mar 31 2002 Joachim Ansorg <jansorg@gmx.de>
-
-- Made including the book translations working finally.
-
-- Fixed SPEC files to work with SuSE
-
-
-* Thu Feb 7 2002 Brook Humphrey <bah@webmedic.net> bibletime-1.0.2
-
-- changed compile time options to mach bibletime spec included with source files
-
-- compiled on mandrake 8.2
-
-
-* Fri Sep 7 2001 Joachim Ansorg <jansorg@gmx.de>
-
-- Added the bookname files in the file list
-
-* Tue Jul 10 2001 Brook Humphrey <bah@webmedic.net> bibletime-1.0.1-Mandrake8.0.4mdk
-
-- Recompile because of dependecy problems.  
-
-* Tue Jul 10 2001 Brook Humphrey <bah@webmedic.net> bibletime-1.0.1-Mandrake8.0.1mdk
-
-- bug fix release bibletime-1.0.1
-
-- adda extra compile options to spec file.
-
-- Merged in suse changes for compileing on SuSE
-
-* Sun May 27 2001 Brook Humphrey <bah@webmedic.net>
-
-- Trying different variations of static compiles again.
-
-- Still using cvs sources while waiting for 1.0 release.
-
-* Thu May 24 2001 Brook Humphrey <bah@webmedic.net>
-
-- Trying for x static and whatever else we can get into it.
-
-- No X for today Got libz to compile in but it causes segfault.
-
-* Wed May 23 2001 Brook Humphrey <bah@webmedic.net>
-
-- Yet another try at static qt.
-
-- Qt static works now.
-
-* Mon May 21 2001 Brook Humphrey <bah@webmedic.net>
-
-- Static is working for kde and a few other libs but not qt yet.
-
-- Testing another patch today to try to get qt compiled static.
-
-* Sun May 20 2001 Brook Humphrey <bah@webmedic.net>
-
-- Cleaned up spec some more(stupid spelling error's)
-
-- static compile not working today so added option to compile kde and sword as static seperately
-
-* Sat May 19 2001 Brook Humphrey <bah@webmedic.net>
-
-- Cleaned up spec some more and added a few more comments
-
-- Changed spec to automaticly do parts concerning static and Mandrake menus
-
-- All info can be set in defines at top of spec file no other changes should need to be made
-
-- Fixed patch to compile static should now compile static with kde libs 
-
-- Test to compile with qt as static also
-
-* Sun May 13 2001 Brook Humphrey <bah@webmedic.net>
-
-- cleaned up spec file and added more comments for easier reading.
-
-- changed sword.conf instelation to check for previous versions of sword.conf
-
-- If found a new sword.conf is not created
-
-- Made a patch to hopefully compile kde and other libs as atatic
-
-- static compile didn't work for today.
-
-* Tue May 8 2001 Brook Humphrey <bah@webmedic.net>
-
-- Updated package to be relocatable
-
-- added sword directories and sword.conf to install
-
-* Mon Apr 30 2001 Brook Humphrey <bah@webmedic.net>
-
-- Changed to build staticly
-
-- added more mandrake macros to spec file
-
-* Mon Apr 23 2001 Brook Humphrey <bah@webmedic.net>
-
-- made changes to enable compile of cvs tree
-
-* Wed Mar 14 2001 Brook Humphrey <bah@webmedic.net>
-
-- updated to use mandrake menu sysem
-
diff --git a/bibletime/Makefile.am b/bibletime/Makefile.am
deleted file mode 100644
index 681152f..0000000
--- a/bibletime/Makefile.am
+++ /dev/null
@@ -1,74 +0,0 @@
-bibletime_SOURCES = \
-bibletime_init.cpp \
-bibletime_slots.cpp \
-bibletime.cpp \
-bibletimeapp.cpp \
-main.cpp
-
-bibletime_LDADD   = \
-./printing/libprinting.a \
-./frontend/displaywindow/libdisplaywindow.a \
-./frontend/display/libdisplay.a \
-./frontend/keychooser/libkeychooser.a \
-./frontend/mainindex/libmainindex.a \
-./frontend/searchdialog/libsearchdialog.a \
-./frontend/libfrontend.a \
-./backend/libbackend.a \
-./util/libutil.a \
--lXext \
-$(LIB_QT) \
-$(LIB_KDECORE) \
-$(LIB_KDEUI) \
--lkdeprint \
-$(LIB_KFILE) \
-$(LIB_KHTML) \
-$(LIB_X11) \
-$(LIB_SWORD) \
-$(LIBSOCKET)
-
-SUBDIRS = backend printing frontend xml pics util
-
-all_headers = bibletime.h bibletimeapp.h
-
-EXTRA_DIST = $(bibletime_SOURCES) $(all_headers)
-
-# this 10 paths are KDE specific. Use them:
-# kde_htmldir       Where your docs should go to. (contains lang subdirs)
-# kde_appsdir       Where your application file (.kdelnk) should go to. 
-# kde_icondir       Where your icon should go to.
-# kde_minidir       Where your mini icon should go to.
-# kde_datadir       Where you install application data. (Use a subdir)
-# kde_locale        Where translation files should go to.(contains lang subdirs)
-# kde_cgidir        Where cgi-bin executables should go to.
-# kde_confdir       Where config files should go to.
-# kde_mimedir       Where mimetypes should go to.
-# kde_toolbardir    Where general toolbar icons should go to.
-# kde_wallpaperdir  Where general wallpapers should go to.
-
-# set the include path for X, qt, KDE and Sword
-INCLUDES = $(all_includes)
-
-# claim, which subdirectories you want to install
-# you can add here more. This one gets installed 
-bin_PROGRAMS = bibletime 
-
-bibletime_METASOURCES = AUTO
-
-# the library search path. 
-bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH)
-
-# them while "make clean", use CLEANFILES
-DISTCLEANFILES = $(bibletime_METASOURCES)
-
-# make messages.po. Move this one to ../po/ and "make merge" in po
-# the -x is for skipping messages already translated in kdelibs
-#messages:
-#	$(XGETTEXT) -C -ki18n -x $(KDEDIR)/include/kde.pot `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o ../po/bibletime.pot
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(kde_confdir)
-
-rpm: dist
-	
-
-
diff --git a/bibletime/Makefile.in b/bibletime/Makefile.in
deleted file mode 100644
index f02672a..0000000
--- a/bibletime/Makefile.in
+++ /dev/null
@@ -1,894 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-bibletime_SOURCES = \
-bibletime_init.cpp \
-bibletime_slots.cpp \
-bibletime.cpp \
-bibletimeapp.cpp \
-main.cpp
-
-
-bibletime_LDADD = \
-./printing/libprinting.a \
-./frontend/displaywindow/libdisplaywindow.a \
-./frontend/display/libdisplay.a \
-./frontend/keychooser/libkeychooser.a \
-./frontend/mainindex/libmainindex.a \
-./frontend/searchdialog/libsearchdialog.a \
-./frontend/libfrontend.a \
-./backend/libbackend.a \
-./util/libutil.a \
--lXext \
-$(LIB_QT) \
-$(LIB_KDECORE) \
-$(LIB_KDEUI) \
--lkdeprint \
-$(LIB_KFILE) \
-$(LIB_KHTML) \
-$(LIB_X11) \
-$(LIB_SWORD) \
-$(LIBSOCKET)
-
-
-SUBDIRS = backend printing frontend xml pics util
-
-all_headers = bibletime.h bibletimeapp.h
-
-EXTRA_DIST = $(bibletime_SOURCES) $(all_headers)
-
-# this 10 paths are KDE specific. Use them:
-# kde_htmldir       Where your docs should go to. (contains lang subdirs)
-# kde_appsdir       Where your application file (.kdelnk) should go to. 
-# kde_icondir       Where your icon should go to.
-# kde_minidir       Where your mini icon should go to.
-# kde_datadir       Where you install application data. (Use a subdir)
-# kde_locale        Where translation files should go to.(contains lang subdirs)
-# kde_cgidir        Where cgi-bin executables should go to.
-# kde_confdir       Where config files should go to.
-# kde_mimedir       Where mimetypes should go to.
-# kde_toolbardir    Where general toolbar icons should go to.
-# kde_wallpaperdir  Where general wallpapers should go to.
-
-# set the include path for X, qt, KDE and Sword
-INCLUDES = $(all_includes)
-
-# claim, which subdirectories you want to install
-# you can add here more. This one gets installed 
-bin_PROGRAMS = bibletime 
-
-#>- bibletime_METASOURCES = AUTO
-
-# the library search path. 
-bibletime_LDFLAGS = $(BT_LDFLAGS) $(all_libraries) $(KDE_RPATH)
-
-# them while "make clean", use CLEANFILES
-DISTCLEANFILES = $(bibletime_METASOURCES)
-subdir = bibletime
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-bin_PROGRAMS = bibletime$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
-
-am_bibletime_OBJECTS = bibletime_init.$(OBJEXT) \
-	bibletime_slots.$(OBJEXT) bibletime.$(OBJEXT) \
-	bibletimeapp.$(OBJEXT) main.$(OBJEXT)
-#>- bibletime_OBJECTS = $(am_bibletime_OBJECTS)
-#>+ 7
-bibletime_final_OBJECTS = bibletime.all_cpp.o 
-bibletime_nofinal_OBJECTS = bibletime_init.$(OBJEXT) \
-	bibletime_slots.$(OBJEXT) bibletime.$(OBJEXT) \
-	bibletimeapp.$(OBJEXT) main.$(OBJEXT)\
-bibletime.moc.o 
-@KDE_USE_FINAL_FALSE@bibletime_OBJECTS = $(bibletime_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@bibletime_OBJECTS = $(bibletime_final_OBJECTS)
-bibletime_DEPENDENCIES = ./printing/libprinting.a \
-	./frontend/displaywindow/libdisplaywindow.a \
-	./frontend/display/libdisplay.a \
-	./frontend/keychooser/libkeychooser.a \
-	./frontend/mainindex/libmainindex.a \
-	./frontend/searchdialog/libsearchdialog.a \
-	./frontend/libfrontend.a ./backend/libbackend.a \
-	./util/libutil.a
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bibletime.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/bibletime_init.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/bibletime_slots.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/bibletimeapp.Po ./$(DEPDIR)/main.Po
-#>+ 8
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/bibletime.moc.P  $(DEPDIR)/bibletime.all_cpp.P ./$(DEPDIR)/bibletime.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/bibletime_init.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/bibletime_slots.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/bibletimeapp.Po ./$(DEPDIR)/main.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/bibletime.moc.P ./$(DEPDIR)/bibletime.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/bibletime_init.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/bibletime_slots.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/bibletimeapp.Po ./$(DEPDIR)/main.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(bibletime_SOURCES)
-
-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
-#>- 	all-recursive install-data-recursive install-exec-recursive \
-#>- 	installdirs-recursive install-recursive uninstall-recursive \
-#>- 	check-recursive installcheck-recursive
-#>+ 5
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(bibletime_SOURCES)
-
-#>- all: all-recursive
-#>+ 1
-all: docs-am  all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  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 \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
-	done
-
-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
-bibletime$(EXEEXT): $(bibletime_OBJECTS) $(bibletime_DEPENDENCIES) 
-	@rm -f bibletime$(EXEEXT)
-	$(CXXLINK) $(bibletime_LDFLAGS) $(bibletime_OBJECTS) $(bibletime_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletime.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletime_init.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletime_slots.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bibletimeapp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-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.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (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.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	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; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	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
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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-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; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	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)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(PROGRAMS)
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_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)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-#>- clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-metasources clean-bcheck clean-final  clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am: install-binPROGRAMS
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-binPROGRAMS clean-generic clean-libtool clean-recursive \
-	ctags ctags-recursive distclean distclean-compile \
-	distclean-depend distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-binPROGRAMS install-data install-data-am \
-	install-data-local install-data-recursive install-exec \
-	install-exec-am install-exec-recursive install-info \
-	install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-info-recursive uninstall-recursive
-
-
-# make messages.po. Move this one to ../po/ and "make merge" in po
-# the -x is for skipping messages already translated in kdelibs
-#messages:
-#	$(XGETTEXT) -C -ki18n -x $(KDEDIR)/include/kde.pot `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o ../po/bibletime.pot
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(kde_confdir)
-
-rpm: dist
-# 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:
-
-#>+ 3
-bibletime.moc.cpp: $(srcdir)/bibletime.h
-	$(MOC) $(srcdir)/bibletime.h -o bibletime.moc.cpp
-
-#>+ 2
-mocs: bibletime.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  bibletime.moc.cpp
-
-#>+ 2
-KDE_DIST=dirlist bibletimeapp.h bibletime.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-bibletime.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/bibletime_init.cpp $(srcdir)/bibletime_slots.cpp $(srcdir)/bibletime.cpp $(srcdir)/bibletimeapp.cpp $(srcdir)/main.cpp bibletime.moc.cpp 
-	@echo 'creating bibletime.all_cpp.cpp ...'; \
-	rm -f bibletime.all_cpp.files bibletime.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> bibletime.all_cpp.final; \
-	for file in bibletime_init.cpp bibletime_slots.cpp bibletime.cpp bibletimeapp.cpp main.cpp bibletime.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> bibletime.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> bibletime.all_cpp.final; \
-	done; \
-	cat bibletime.all_cpp.final bibletime.all_cpp.files > bibletime.all_cpp.cpp; \
-	rm -f bibletime.all_cpp.final bibletime.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f bibletime.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) bibletime_OBJECTS="$(bibletime_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) bibletime_OBJECTS="$(bibletime_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) bibletime_OBJECTS="$(bibletime_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) bibletime_OBJECTS="$(bibletime_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/backend/Makefile.am b/bibletime/backend/Makefile.am
deleted file mode 100644
index cc89edb..0000000
--- a/bibletime/backend/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-libbackend_a_METASOURCES = AUTO
-noinst_LIBRARIES = libbackend.a
-
-INCLUDES = $(all_includes)
-
-libbackend_a_SOURCES = cswordmodulesearch.cpp cswordbackend.cpp cswordkey.cpp cswordldkey.cpp cswordversekey.cpp cswordmoduleinfo.cpp cswordlexiconmoduleinfo.cpp cswordcommentarymoduleinfo.cpp cswordbiblemoduleinfo.cpp cswordbookmoduleinfo.cpp cswordtreekey.cpp creferencemanager.cpp bt_thmlhtml.cpp bt_osishtml.cpp bt_gbfhtml.cpp centrydisplay.cpp clanguagemgr.cpp cfiltertool.cpp
-
-all_headers = cswordbiblemoduleinfo.h \
-cswordcommentarymoduleinfo.h \
-cswordlexiconmoduleinfo.h \
-cswordkey.h \
-cswordversekey.h \
-cswordldkey.h \
-cswordbackend.h \
-cswordmoduleinfo.h \
-cswordmodulesearch.h \
-creferencemanager.h \
-cswordbookmoduleinfo.h \
-cswordtreekey.h \
-bt_thmlhtml.h \
-bt_osishtml.h \
-bt_gbfhtml.h \
-centrydisplay.h \
-clanguagemgr.h \
-cfiltertool.h
-
-EXTRA_DIST = $(libbackend_a_SOURCES) $(all_headers)
-
diff --git a/bibletime/backend/Makefile.in b/bibletime/backend/Makefile.in
deleted file mode 100644
index c73ac39..0000000
--- a/bibletime/backend/Makefile.in
+++ /dev/null
@@ -1,765 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-#>- libbackend_a_METASOURCES = AUTO
-noinst_LIBRARIES = libbackend.a
-
-INCLUDES = $(all_includes)
-
-libbackend_a_SOURCES = cswordmodulesearch.cpp cswordbackend.cpp cswordkey.cpp cswordldkey.cpp cswordversekey.cpp cswordmoduleinfo.cpp cswordlexiconmoduleinfo.cpp cswordcommentarymoduleinfo.cpp cswordbiblemoduleinfo.cpp cswordbookmoduleinfo.cpp cswordtreekey.cpp creferencemanager.cpp bt_thmlhtml.cpp bt_osishtml.cpp bt_gbfhtml.cpp centrydisplay.cpp clanguagemgr.cpp cfiltertool.cpp
-
-all_headers = cswordbiblemoduleinfo.h \
-cswordcommentarymoduleinfo.h \
-cswordlexiconmoduleinfo.h \
-cswordkey.h \
-cswordversekey.h \
-cswordldkey.h \
-cswordbackend.h \
-cswordmoduleinfo.h \
-cswordmodulesearch.h \
-creferencemanager.h \
-cswordbookmoduleinfo.h \
-cswordtreekey.h \
-bt_thmlhtml.h \
-bt_osishtml.h \
-bt_gbfhtml.h \
-centrydisplay.h \
-clanguagemgr.h \
-cfiltertool.h
-
-
-EXTRA_DIST = $(libbackend_a_SOURCES) $(all_headers)
-subdir = bibletime/backend
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libbackend_a_AR = $(AR) cru
-libbackend_a_LIBADD =
-am_libbackend_a_OBJECTS = cswordmodulesearch.$(OBJEXT) \
-	cswordbackend.$(OBJEXT) cswordkey.$(OBJEXT) \
-	cswordldkey.$(OBJEXT) cswordversekey.$(OBJEXT) \
-	cswordmoduleinfo.$(OBJEXT) cswordlexiconmoduleinfo.$(OBJEXT) \
-	cswordcommentarymoduleinfo.$(OBJEXT) \
-	cswordbiblemoduleinfo.$(OBJEXT) cswordbookmoduleinfo.$(OBJEXT) \
-	cswordtreekey.$(OBJEXT) creferencemanager.$(OBJEXT) \
-	bt_thmlhtml.$(OBJEXT) bt_osishtml.$(OBJEXT) \
-	bt_gbfhtml.$(OBJEXT) centrydisplay.$(OBJEXT) \
-	clanguagemgr.$(OBJEXT) cfiltertool.$(OBJEXT)
-#>- libbackend_a_OBJECTS = $(am_libbackend_a_OBJECTS)
-#>+ 13
-libbackend_a_final_OBJECTS = libbackend_a.all_cpp.o 
-libbackend_a_nofinal_OBJECTS = cswordmodulesearch.$(OBJEXT) \
-	cswordbackend.$(OBJEXT) cswordkey.$(OBJEXT) \
-	cswordldkey.$(OBJEXT) cswordversekey.$(OBJEXT) \
-	cswordmoduleinfo.$(OBJEXT) cswordlexiconmoduleinfo.$(OBJEXT) \
-	cswordcommentarymoduleinfo.$(OBJEXT) \
-	cswordbiblemoduleinfo.$(OBJEXT) cswordbookmoduleinfo.$(OBJEXT) \
-	cswordtreekey.$(OBJEXT) creferencemanager.$(OBJEXT) \
-	bt_thmlhtml.$(OBJEXT) bt_osishtml.$(OBJEXT) \
-	bt_gbfhtml.$(OBJEXT) centrydisplay.$(OBJEXT) \
-	clanguagemgr.$(OBJEXT) cfiltertool.$(OBJEXT)
-@KDE_USE_FINAL_FALSE@libbackend_a_OBJECTS = $(libbackend_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libbackend_a_OBJECTS = $(libbackend_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/bt_gbfhtml.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/bt_osishtml.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/bt_thmlhtml.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/centrydisplay.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cfiltertool.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/clanguagemgr.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/creferencemanager.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordbackend.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordbiblemoduleinfo.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordbookmoduleinfo.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordcommentarymoduleinfo.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordkey.Po ./$(DEPDIR)/cswordldkey.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordlexiconmoduleinfo.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordmoduleinfo.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordmodulesearch.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordtreekey.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordversekey.Po
-#>+ 34
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libbackend_a.all_cpp.P ./$(DEPDIR)/bt_gbfhtml.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/bt_osishtml.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/bt_thmlhtml.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/centrydisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cfiltertool.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/clanguagemgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/creferencemanager.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordbackend.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordbiblemoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordbookmoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordcommentarymoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordkey.Po ./$(DEPDIR)/cswordldkey.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordlexiconmoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordmoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordmodulesearch.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordtreekey.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordversekey.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  ./$(DEPDIR)/bt_gbfhtml.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/bt_osishtml.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/bt_thmlhtml.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/centrydisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cfiltertool.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/clanguagemgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/creferencemanager.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordbackend.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordbiblemoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordbookmoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordcommentarymoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordkey.Po ./$(DEPDIR)/cswordldkey.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordlexiconmoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordmoduleinfo.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordmodulesearch.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordtreekey.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordversekey.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libbackend_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libbackend_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/backend/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/backend/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/backend/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libbackend.a: $(libbackend_a_OBJECTS) $(libbackend_a_DEPENDENCIES) 
-	-rm -f libbackend.a
-	$(libbackend_a_AR) libbackend.a $(libbackend_a_OBJECTS) $(libbackend_a_LIBADD)
-	$(RANLIB) libbackend.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bt_gbfhtml.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bt_osishtml.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bt_thmlhtml.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/centrydisplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfiltertool.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clanguagemgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creferencemanager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordbackend.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordbiblemoduleinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordbookmoduleinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordcommentarymoduleinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordkey.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordldkey.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordlexiconmoduleinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordmoduleinfo.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordmodulesearch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordtreekey.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordversekey.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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:  $(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 "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-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
-
-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-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-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.
-.NOEXPORT:
-
-#>+ 2
-KDE_DIST=cswordmodulesearch.h clanguagemgr.h bt_osishtml.h bt_gbfhtml.h cswordtreekey.h cswordmoduleinfo.h cswordbookmoduleinfo.h cswordldkey.h creferencemanager.h cswordcommentarymoduleinfo.h cswordversekey.h cswordbackend.h cswordkey.h cswordlexiconmoduleinfo.h cswordbiblemoduleinfo.h cfiltertool.h bt_thmlhtml.h centrydisplay.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/backend/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/backend/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libbackend_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cswordmodulesearch.cpp $(srcdir)/cswordbackend.cpp $(srcdir)/cswordkey.cpp $(srcdir)/cswordldkey.cpp $(srcdir)/cswordversekey.cpp $(srcdir)/cswordmoduleinfo.cpp $(srcdir)/cswordlexiconmoduleinfo.cpp $(srcdir)/cswordcommentarymoduleinfo.cpp $(srcdir)/cswordbiblemoduleinfo.cpp $(srcdir)/cswordbookmoduleinfo.cpp $(srcdir)/cswordtreekey.cpp $(srcdir)/creferencemanager.cpp $(srcdir)/bt_thmlhtml.cpp $(srcdir)/bt_osishtml.cpp $(srcdir)/bt_gbfhtml.cpp $(srcdir)/centrydisplay.cpp $(srcdir)/clanguagemgr.cpp $(srcdir)/cfiltertool.cpp 
-	@echo 'creating libbackend_a.all_cpp.cpp ...'; \
-	rm -f libbackend_a.all_cpp.files libbackend_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libbackend_a.all_cpp.final; \
-	for file in cswordmodulesearch.cpp cswordbackend.cpp cswordkey.cpp cswordldkey.cpp cswordversekey.cpp cswordmoduleinfo.cpp cswordlexiconmoduleinfo.cpp cswordcommentarymoduleinfo.cpp cswordbiblemoduleinfo.cpp cswordbookmoduleinfo.cpp cswordtreekey.cpp creferencemanager.cpp bt_thmlhtml.cpp bt_osishtml.cpp bt_gbfhtml.cpp centrydisplay.cpp clanguagemgr.cpp cfiltertool.cpp ; do \
-	  echo "#include \"$$file\"" >> libbackend_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libbackend_a.all_cpp.final; \
-	done; \
-	cat libbackend_a.all_cpp.final libbackend_a.all_cpp.files > libbackend_a.all_cpp.cpp; \
-	rm -f libbackend_a.all_cpp.final libbackend_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libbackend_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libbackend_a_OBJECTS="$(libbackend_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libbackend_a_OBJECTS="$(libbackend_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libbackend_a_OBJECTS="$(libbackend_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libbackend_a_OBJECTS="$(libbackend_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/backend/bt_gbfhtml.cpp b/bibletime/backend/bt_gbfhtml.cpp
deleted file mode 100644
index 092bf5a..0000000
--- a/bibletime/backend/bt_gbfhtml.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-/***************************************************************************
-                          gbfhtml.cpp  -  description
-                             -------------------
-    begin                : Thu Jun 24 1999
-    copyright            : (C) 1999 by Torsten Uhlmann
-    email                : TUhlmann@gmx.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordmoduleinfo.h"
-#include "cswordbackend.h"
-#include "util/cpointers.h"
-
-#include "bt_gbfhtml.h"
-
-//sytsme includes
-#include <stdlib.h>
-#include <stdio.h>
-
-//Sword includes
-#include <utilxml.h>
-
-//Qt includes
-#include <qregexp.h>
-#include <qstring.h>
-
-
-BT_GBFHTML::BT_GBFHTML(){
-  setTokenStart("<");
-	setTokenEnd(">");
-	
-	setTokenCaseSensitive(true);
-
-	replaceTokenSubstitute("Rf", ")</span>");// end of footnote
-
-	replaceTokenSubstitute("FI", "<i>"); // italics begin
-	replaceTokenSubstitute("Fi", "</i>");
-
-	replaceTokenSubstitute("FB", "<b>"); // bold begin
-	replaceTokenSubstitute("Fb", "</b>");
-
-	replaceTokenSubstitute("FR", "<span class=\"jesuswords\">");
-	replaceTokenSubstitute("Fr", "</span>");
-
-	replaceTokenSubstitute("FU", "<u>"); // underline begin
-	replaceTokenSubstitute("Fu", "</u>");
-
-//	replaceTokenSubstitute("FO", "<cite>"); //  Old Testament quote begin
-//	replaceTokenSubstitute("Fo", "</cite>");
-	replaceTokenSubstitute("FO", "<span class=\"quotation\">"); //  Old Testament quote begin
-	replaceTokenSubstitute("Fo", "</span>");
-
-
-  replaceTokenSubstitute("FS", "<sup>"); // Superscript begin// Subscript begin
-	replaceTokenSubstitute("Fs", "</sup>");
-
-  replaceTokenSubstitute("FV", "<sub>"); // Subscript begin
-	replaceTokenSubstitute("Fv", "</sub>");
-
-//	replaceTokenSubstitute("TT", QString::fromLatin1(" <h1><font color=\"%1\">").arg(text_color).local8Bit());
-//	replaceTokenSubstitute("Tt", "</font></h1>");
-	replaceTokenSubstitute("TT", "<div class=\"booktitle\">");
-	replaceTokenSubstitute("Tt", "</div>");
-
-	replaceTokenSubstitute("TS", "<div class=\"sectiontitle\">");
-	replaceTokenSubstitute("Ts", "</div>");
-
-	replaceTokenSubstitute("PP", "<span class=\"poetry\">"); //  poetry  begin
-	replaceTokenSubstitute("Pp", "</span>");
-
-	replaceTokenSubstitute("Fn", "</font>"); //  font  end
-	replaceTokenSubstitute("CL", "<br>"); //  new line
-	replaceTokenSubstitute("CM", "<!p><br>"); //  paragraph <!P> is a non showing comment that can be changed in the front end to <P> if desired
-
-  replaceTokenSubstitute("CG", "&gt;"); // literal greater-than sign
-	replaceTokenSubstitute("CT", "&lt;"); // literal less-than sign
-
-  replaceTokenSubstitute("JR", "<span align=\"right\">"); // right align begin
-	replaceTokenSubstitute("JC", "<span align=\"center\">"); // center align begin
-	replaceTokenSubstitute("JL", "</span>"); // align end
-}
-
-/** No descriptions */
-char BT_GBFHTML::processText(sword::SWBuf& buf, const sword::SWKey * key, const sword::SWModule * module){
-	GBFHTML::processText(buf, key, module);
-
-  CSwordModuleInfo* const mod = CPointers::backend()->findSwordModuleByPointer(module);
-  if (!mod || (mod && (mod->type() != CSwordModuleInfo::Bible) && (mod->type() != CSwordModuleInfo::GenericBook))) {
-    ProcessRWPRefs(buf, mod ? mod->module() : 0);
-  }
-
-  return 1;
-}
-
-bool BT_GBFHTML::handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData) {
-	if (!substituteToken(buf, token)) {  //more than a simple replace
-  	const unsigned int tokenLength = strlen(token);
-		unsigned long i;
-    sword::SWBuf value;
-    BT_UserData* myUserData = dynamic_cast<BT_UserData*>(userData);
-
-    if (!strncmp(token, "WG", 2)){ // strong's numbers greek
-			for (i = 2; i < tokenLength; i++) {
-					value += token[i];
-      }
-      
-			buf.appendFormatted(" <a href=\"strongs://Greek/%s\"><span class=\"strongnumber\">&lt;%s&gt;</span></a> ",
-				value.c_str(),
-        value.c_str()
-      );
-		}
-		else if (!strncmp(token, "WH", 2)){ // strong's numbers hebrew
-			for (i = 2; i < tokenLength; i++) {
-					value += token[i];
-      }
-      
-			buf.appendFormatted(" <a href=\"strongs://Hebrew/%s\"><span class=\"strongnumber\">&lt;%s&gt;</span> </a>",
-				value.c_str(),
-        value.c_str()
-      );
-		}
-		else if (!strncmp(token, "WTG", 3)) { // strong's numbers tense greek
-			for (i = 3; i < tokenLength; i++) {
-					value += token[i];
-      }
-
-			buf.appendFormatted(" <a href=\"morph://Greek/%s\"><span class=\"morphcode\">(%s)</span></a> ",
-				value.c_str(),
-				value.c_str()
-      );
-		}
-
-		else if (!strncmp(token, "WTH", 3)) { // strong's numbers tense hebrew
-			for (i = 3; i < tokenLength; i++) {
-					value += token[i];
-      }
-
-			buf.appendFormatted(" <a href=\"morph://Hebrew/%s\"><span class=\"morphcode\">(%s)</span></a> ",
-				value.c_str(),
-				value.c_str()
-      );
-		}
-
-		else if (!strncmp(token, "RB", 2)) {
-			buf += "<span class=\"footnotepre\">";
-			myUserData->hasFootnotePreTag = true;
-		}
-
-		else if (!strncmp(token, "RF", 2)) {
-			if (myUserData->hasFootnotePreTag) {
-				myUserData->hasFootnotePreTag = false;
-				buf += "</span> ";
-			}
-			buf += "<span class=\"footnote\"> (";
-		}
-
-		else if (!strncmp(token, "FN", 2)) {
-			buf += "<font face=\"";
-			for (i = 2; i < tokenLength; i++) {
-				if(token[i] != '\"') {
-					buf += token[i];
-        }
-      }
-			buf += "\">";
-		}
-		else if (!strncmp(token, "CA", 2)) {	// ASCII value
-			buf += (char)atoi(&token[2]);
-		}		
-		else {
-			return GBFHTML::handleToken(buf, token, userData);
-		}
-	}
-	return true;
-}
-
diff --git a/bibletime/backend/bt_gbfhtml.h b/bibletime/backend/bt_gbfhtml.h
deleted file mode 100644
index 97f227d..0000000
--- a/bibletime/backend/bt_gbfhtml.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
-                          gbfhtml.h  -  description
-                             -------------------
-    begin                : Tue Jun 15 15:34:26 CEST 1999
-
-    copyright            : (C) 1999 by Torsten Uhlmann
-    email                : TUhlmann@gmx.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-/* $Header: /cvsroot/bibletime/bibletime/bibletime/backend/bt_gbfhtml.h,v 1.14 2003/08/12 19:37:15 joachim Exp $ */
-/* $Revision: 1.14 $ */
-
-#ifndef BT_GBFHTML_H
-#define BT_GBFHTML_H
-
-#include "cfiltertool.h"
-
-#include <swkey.h>
-#include <swmodule.h>
-#include <swbasicfilter.h>
-#include <gbfhtml.h>
-
-/**
-* This filter converts GBF Text into HTML
-*/
-class BT_GBFHTML : public sword::GBFHTML, protected CFilterTool {
-protected:
-  class BT_UserData : public sword::GBFHTML::MyUserData {
-  public:
-    BT_UserData(const sword::SWModule *module, const sword::SWKey *key) : sword::GBFHTML::MyUserData(module, key) {}
-    bool hasFootnotePreTag;
-  };
-  virtual sword::BasicFilterUserData *createUserData(const sword::SWModule* module, const sword::SWKey* key) {
-    return new BT_UserData(module, key);
-  }
-
-public:
-  BT_GBFHTML ();
-  virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData);
-  virtual char processText(sword::SWBuf& buf, const sword::SWKey*, const sword::SWModule * = 0);
-};
-
-#endif
diff --git a/bibletime/backend/bt_osishtml.cpp b/bibletime/backend/bt_osishtml.cpp
deleted file mode 100644
index c3b1d7b..0000000
--- a/bibletime/backend/bt_osishtml.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-/***************************************************************************
-                     thmlhtml.cpp  -  ThML to HTML filter
-                             -------------------
-    begin                : 1999-10-27
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include <stdlib.h>
-#include "bt_osishtml.h"
-#include "versekey.h"
-
-#include "clanguagemgr.h"
-#include "creferencemanager.h"
-#include "cswordmoduleinfo.h"
-#include "frontend/cbtconfig.h"
-#include "util/cpointers.h"
-
-#include <iostream>
-
-//Sword includes
-#include <swmodule.h>
-#include <swbuf.h>
-#include <utilxml.h>
-
-//Qt includes
-#include <qstring.h>
-
-using sword::SWBuf;
-using sword::XMLTag;
-
-BT_OSISHTML::BT_OSISHTML() {
-	setTokenStart("<");
-	setTokenEnd(">");
-
-	setEscapeStart("&");
-	setEscapeEnd(";");
-
-	setEscapeStringCaseSensitive(true);
-	setPassThruUnknownEscapeString(true); //the HTML widget will render the HTML escape codes
-
-	setTokenCaseSensitive(true);
-}
-
-bool BT_OSISHTML::handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData) {
-  // manually process if it wasn't a simple substitution
-	if (!substituteToken(buf, token)) {
-    BT_UserData* myUserData = dynamic_cast<BT_UserData*>(userData);
-
-    XMLTag tag(token);
-  	const	bool osisQToTick = ((!userData->module->getConfigEntry("OSISqToTick")) || (strcmp(userData->module->getConfigEntry("OSISqToTick"), "false")));
-
-    if (!tag.getName()) {
-      return false;
-    }
-
-		// <w> tag
-		if (!strcmp(tag.getName(), "w")) {
-
-			// start <w> tag
-			if ((!tag.isEmpty()) && (!tag.isEndTag())) {
-				myUserData->w = token;
-			}
-			// end or empty <w> tag
-			else {
-				bool endTag = tag.isEndTag();
-				SWBuf lastText;
-				bool show = true;	// to handle unplaced article in kjv2003-- temporary till combined
-
-				if (endTag) {
-					tag = myUserData->w.c_str();
-					lastText = myUserData->lastTextNode.c_str();
-				}
-				else lastText = "stuff";
-
-				const char *attrib;
-				const char *val;
-				if ((attrib = tag.getAttribute("xlit"))) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
-				}
-				if ((attrib = tag.getAttribute("gloss"))) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
-				}
-				if ((attrib = tag.getAttribute("lemma"))) {
-					const int count = tag.getAttributePartCount("lemma");
-					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
-					do {
-						attrib = tag.getAttribute("lemma", i);
-						if (i < 0) // to handle our -1 condition
-              i = 0;
-						val = strchr(attrib, ':');
-						val = (val) ? (val + 1) : attrib;
-
-            if ((!strcmp(val+2, "3588")) && (lastText.length() < 1)) {
-							show = false;
-            }
-						else if (*val == 'H') {
-              buf.appendFormatted(" <a href=\"strongs://Hebrew/%s\"><span class=\"strongnumber\">&lt;%s&gt;</span></a> ", val+1, val+1);
-            }
-						else if (*val == 'G') {
-              buf.appendFormatted(" <a href=\"strongs://Greek/%s\"><span class=\"strongnumber\">&lt;%s&gt;</span></a> ", val+1, val+1);
-            }
-					} while (++i < count);
-				}
-				if ((attrib = tag.getAttribute("morph")) && (show)) {
-					const int count = tag.getAttributePartCount("morph");
-					int i = (count > 1) ? 0 : -1;		// -1 for whole value cuz it's faster, but does the same thing as 0
-					do {
-						attrib = tag.getAttribute("morph", i);
-						if (i < 0)
-              i = 0;	// to handle our -1 condition
-						val = strchr(attrib, ':');
-						val = (val) ? (val + 1) : attrib;
- 						if ((*val == 'T') && (val[1] == 'H')) {
-              buf.appendFormatted(" <a href=\"morph://Hebrew/%s\"><span class=\"morphcode\">(%s)</span></a> ", val+2, val+2);
-            }
-						else if ((*val == 'T') && (val[1] == 'G')) {
-              buf.appendFormatted(" <a href=\"morph://Greek/%s\"><span class=\"morphcode\">(%s)</span></a> ", val+2, val+2);
-            }
-            else if ((*val == 'T')) {
-              buf.appendFormatted(" <a href=\"morph://Greek/%s\"><span class=\"morphcode\">(%s)</span></a> ", val+2, val+2);
-            }
-					} while (++i < count);
-				}
-				if ((attrib = tag.getAttribute("POS"))) {
-					val = strchr(attrib, ':');
-					val = (val) ? (val + 1) : attrib;
-					buf.appendFormatted(" %s", val);
-				}
-			}
-		}
-		// <note> tag
-		else if (!strcmp(tag.getName(), "note")) {
-			if (!tag.isEndTag()) {
-				const SWBuf type = tag.getAttribute("type");
-
-				if (type == "crossReference") { //note containing cross references
-          buf += " <span class=\"footnote\">[";
-          myUserData->noteType = BT_UserData::CrossReference;
-        }
-        else if (type == "strongsMarkup") {
-  				myUserData->suspendTextPassThru = true;
-          myUserData->noteType = BT_UserData::StrongsMarkup;
-        }
-        else {	// leave strong's markup notes out, in the future we'll probably have different option filters to turn different note types on or off
-          buf += " <span class=\"footnote\">(";
-          myUserData->noteType = BT_UserData::Footnote;
-				}
-			}
-			if (tag.isEndTag()) {
-        if (myUserData->noteType == BT_UserData::CrossReference) {
-          buf += "]</span> ";
-        }
-        else if (myUserData->noteType == BT_UserData::Footnote) {
-          buf += ")</span> ";
-        }
-
-        myUserData->noteType = BT_UserData::Unknown;
-				myUserData->suspendTextPassThru = false;
-			}
-		}
-		// <p> paragraph tag is handled by OSISHTMLHref
-		// <reference> tag
-		else if (!strcmp(tag.getName(), "reference")) {
-			if (!tag.isEndTag() && !tag.isEmpty() && tag.getAttribute("osisRef")) {
-        const char* ref = tag.getAttribute("osisRef");
-
-        SWBuf typeName = "Bible";
-        CSwordModuleInfo::ModuleType type = CSwordModuleInfo::Bible;
-        if (!strncmp(ref, "Bible:", 6)) {
-          type = CSwordModuleInfo::Bible;
-          typeName = "Bible";
-          ref += 6;
-        }
-        else if (!strncmp(ref, "Commentary:", 11)) { //need to check with OSIS tags
-          type = CSwordModuleInfo::Commentary;
-          typeName = "Commentary";
-          ref += 11;
-        }
-
-				buf.appendFormatted("<a class=\"reference\" href=\"sword://%s/%s/%s\">",
-          typeName.c_str(),
-          CReferenceManager::preferredModule( CReferenceManager::typeFromModule(type) ).latin1(),
-          ref
-        );
-			}
-			else if (tag.isEndTag()) {
-				buf += "</a>";
-			}
-			else {	// empty reference marker
-				// -- what should we do?  nothing for now.
-			}
-		}
-    // <l> is handled by OSISHTMLHref
-		// <title>
-		else if (!strcmp(tag.getName(), "title")) {
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-  			buf += "<div class=\"sectiontitle\">";
-			}
-			else if (tag.isEndTag()) {
-  			buf += "</div>";
-			}
-			else {	// empty title marker
-				// what to do?  is this even valid?
-				buf += "<br />";
-			}
-		}
-		// <hi> is handled by OSISHTMLHRef
-		// <q> quote
-		else if (!strcmp(tag.getName(), "q")) {
-			SWBuf type = tag.getAttribute("type");
-			SWBuf who = tag.getAttribute("who");
-			const char *lev = tag.getAttribute("level");
-			int level = (lev) ? atoi(lev) : 1;
-
-			if ((!tag.isEndTag()) && (!tag.isEmpty())) {
-				/*buf += "{";*/
-
-				myUserData->quote.who = who;
-				//alternate " and '
-				if(osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-
-				if (who == "Jesus") {
-					buf += "<span class=\"jesuswords\">";
-				}
-			}
-			else if (tag.isEndTag()) {
-        if (myUserData->quote.who == "Jesus")
-          buf += "</span>";
-        else if (osisQToTick) //alternate " and '
-					buf += (level % 2) ? '\"' : '\'';
-			}
-			else {	// empty quote marker
-				//alternate " and '
-				if(osisQToTick)
-					buf += (level % 2) ? '\"' : '\'';
-			}
-		}
-		// <transChange> is handled by OSISHTMLHref
-    else { //all tokens handled by OSISHTMLHref will run through the filter now
-      return sword::OSISHTMLHREF::handleToken(buf, token, userData);
-    }
-	}
-  return false;
-}
diff --git a/bibletime/backend/bt_osishtml.h b/bibletime/backend/bt_osishtml.h
deleted file mode 100644
index a42bbda..0000000
--- a/bibletime/backend/bt_osishtml.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************
-                          thmlhtml.h  -  description
-                             -------------------
-    begin                : 1999-10-28
-
-    copyright            : 1999 by Chris Little
-    email                : chrislit@chiasma.org
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef BT_OSISHTML_H
-#define BT_OSISHTML_H
-
-#include "cfiltertool.h"
-
-//Sword includes
-#include <osishtmlhref.h>
-
-/**
-* This filter converts ThML text to HTML text
-*/
-class BT_OSISHTML : public sword::OSISHTMLHREF, protected CFilterTool {
-protected:
-  class BT_UserData : public sword::OSISHTMLHREF::MyUserData {
-  public:
-    BT_UserData(const sword::SWModule *module, const sword::SWKey *key) : sword::OSISHTMLHREF::MyUserData(module, key) {
-      noteType = Unknown;
-    }
-
-    enum NoteTpe {
-      Unknown,
-      CrossReference,
-      Footnote,
-      StrongsMarkup
-    } noteType;
-
-		struct {
-			sword::SWBuf who;
-		} quote;
-  };
-
-  virtual sword::BasicFilterUserData *createUserData(const sword::SWModule* module, const sword::SWKey* key) {
-    return new BT_UserData(module, key);
-  }
-
-public:
-  BT_OSISHTML();
-  virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData);
-};
-
-#endif
diff --git a/bibletime/backend/bt_thmlhtml.cpp b/bibletime/backend/bt_thmlhtml.cpp
deleted file mode 100644
index 7e2e566..0000000
--- a/bibletime/backend/bt_thmlhtml.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-/***************************************************************************
-                     thmlhtml.cpp  -  ThML to HTML filter
-                             -------------------
-    begin                : 1999-10-27
-    copyright            : 2001 by CrossWire Bible Society
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include <stdlib.h>
-#include "bt_thmlhtml.h"
-#include "versekey.h"
-
-#include "clanguagemgr.h"
-#include "frontend/cbtconfig.h"
-#include "util/cpointers.h"
-
-#include <iostream>
-
-//Sword includes
-#include <swmodule.h>
-#include <utilxml.h>
-
-//Qt includes
-#include <qstring.h>
-
-BT_ThMLHTML::BT_ThMLHTML() {
-	setEscapeStringCaseSensitive(true);
-	setPassThruUnknownEscapeString(true); //the HTML widget will render the HTML escape codes	
-
-  setTokenStart("<");
-	setTokenEnd(">");
-	setTokenCaseSensitive(true);
-  
-	replaceTokenSubstitute("/foreign", "</span>");
-
-  if (tokenSubMap.find("note") != tokenSubMap.end()) { //remove note tag
-	  tokenSubMap.erase( tokenSubMap.find("note") );
-  }
-	replaceTokenSubstitute("/note", ")</span>");	
-}
-
-bool BT_ThMLHTML::handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData) {  
-	if (!substituteToken(buf, token) && !substituteEscapeString(buf, token)) {
-    sword::XMLTag tag(token);
-    BT_UserData* myUserData = dynamic_cast<BT_UserData*>(userData);
-    sword::SWModule* myModule = const_cast<sword::SWModule*>(myUserData->module); //hack to be able to call stuff like Lang()
-
-    if ( tag.getName() && !strcasecmp(tag.getName(), "foreign") ) { // a text part in another language, we have to set the right font
-      if (tag.getAttribute("lang")) {
-        const char* abbrev = tag.getAttribute("lang");
-
-        CLanguageMgr::Language language = CPointers::languageMgr()->languageForAbbrev( QString::fromLatin1(abbrev) );
-
-        if (language.isValid()) {
-          CBTConfig::FontSettingsPair fontSetting = CBTConfig::get(language);
-          if (fontSetting.first) {
-            const QFont f = fontSetting.second;
-            buf.appendFormatted("<span lang=\"%s\" style=\"font-family:%s;font-size:%ipt;\">",
-              abbrev,
-              f.family().latin1(),
-              f.pointSize()
-            );
-          }
-          else { //CBTConfig says: don't set a special font, so we just set the language flag
-            buf.appendFormatted("<span lang=\"%s\">", abbrev);
-          }
-        }
-        else { //invalid language, just set the HTML language attribute
-          buf.appendFormatted("<span lang=\"%s\">", abbrev);
-        }
-      }
-    }
-    else if (tag.getName() && !strcasecmp(tag.getName(), "sync")) { //lemmas, morph codes or strongs
-      if (tag.getAttribute("type") && !strcasecmp(tag.getAttribute("type"), "lemma")) { // Lemma
-        const char* value = tag.getAttribute("value");
-        if ( strlen(value) ) {
-          buf.appendFormatted(" &lt;%s&gt; ",
-            value
-          );
-        };
-      }
-      else if (tag.getAttribute("type") && !strcasecmp(tag.getAttribute("type"), "morph")) { // Morph
-        const char* value = tag.getAttribute("value");
-        if ( value ) {
-          buf.appendFormatted(" <a href=\"morph://Greek/%s\"><span class=\"morphcode\">(%s)</span></a> ",
-            value,
-            value
-          );
-        };
-  		}
-		  else if (tag.getAttribute("type") && !strcasecmp(tag.getAttribute("type"), "Strongs")) { // Strongs
-        const char* value = tag.getAttribute("value");
-        if ( value && value[0] == 'H' ) { //hewbrew strong number
-          buf.appendFormatted(" <a href=\"strongs://Hebrew/%s\"><span class=\"strongnumber\">&lt;%s&gt;</span></a> ",
-     				value+1, //skip the H
-            value+1 //skip the H
-          );
-        }
-        else if ( value && value[0] == 'G' ) { //hewbrew strong number
-          buf.appendFormatted(" <a href=\"strongs://Greek/%s\"><span class=\"strongnumber\">&lt;%s&gt;</span></a> ",
-      			value+1, //skip the G
-            value+1 //skip the G
-          );
-        };
-      };
-		}
-		else if (tag.getName() && !strcasecmp(tag.getName(), "note")) { // <note> tag
-			if (!tag.isEndTag() && !tag.isEmpty()) {
-				//SWBuf type = tag.getAttribute("type");
-				//SWBuf footnoteNumber = tag.getAttribute("swordFootnote");
-				buf += "<span class=\"footnote\">(";
-			}
-		}
-		else if (tag.getName() && !strcasecmp(tag.getName(), "scripRef")) { // a more complicated scripRef
-      if (tag.isEndTag()) {
-       	if (myUserData->inscriptRef) { // like  "<scripRef passage="John 3:16">See John 3:16</scripRef>"
-  				myUserData->inscriptRef = false;
-  				buf += thmlRefEnd().c_str();
-  			}
-  			else { // like "<scripRef>John 3:16</scripRef>"
-   			  buf += parseSimpleRef( myUserData->lastTextNode, myModule ? myModule->Lang() : "en" ).c_str();
-  				myUserData->suspendTextPassThru = false;
-  			}
-      }		
-      else if (tag.getAttribute("passage") ) { //the passage was given within the scripRef tag
-        myUserData->inscriptRef = true;
-        buf += parseThMLRef(tag.getAttribute("passage"), tag.getAttribute("version")).c_str();
-      }
-      else if ( !tag.getAttribute("passage") ) { // we're starting a scripRef like "<scripRef>John 3:16</scripRef>"
-	  		myUserData->inscriptRef = false;
-  			// let's stop text from going to output
-		  	userData->suspendTextPassThru = true;
-      }
-		}
-		else if (tag.getName() && !strcasecmp(tag.getName(), "div")) {                                      
-      if (tag.isEndTag()) {
-        buf += "</div>";
-      }
-      else if ( tag.getAttribute("class") && !strcasecmp(tag.getAttribute("class"),"sechead") ) {
-  			buf += "<div class=\"sectiontitle\">";
-      }
-  		else if (tag.getAttribute("class") && !strcasecmp(tag.getAttribute("class"), "title")) {
-		  	buf += "<div class=\"booktitle\">";
-      }
-    }
-		else if (tag.getName() && !strcasecmp(tag.getName(), "img") && tag.getAttribute("src")) {
-      const char* value = tag.getAttribute("src");
-      if (value[0] == '/') {
-        value++; //strip the first /
-      }
-      
-      buf.appendFormatted("<img src=\"file:%s/%s\" />",
-        myUserData->module->getConfigEntry("AbsoluteDataPath"),
-        value
-      );
- 		}
-    else { // let unknown token pass thru
-    	return sword::ThMLHTML::handleToken(buf, token, userData);
-    }
-  }
-	return true;
-}
diff --git a/bibletime/backend/bt_thmlhtml.h b/bibletime/backend/bt_thmlhtml.h
deleted file mode 100644
index 6588f85..0000000
--- a/bibletime/backend/bt_thmlhtml.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
-                          thmlhtml.h  -  description
-                             -------------------
-    begin                : 1999-10-28
-
-    copyright            : 1999 by Chris Little
-    email                : chrislit@chiasma.org
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef BT_THMLHTML_H
-#define BT_THMLHTML_H
-
-#include "cfiltertool.h"
-
-#include <swbuf.h>
-#include <thmlhtml.h>
-
-using sword::SWBuf;
-//using sword::
-
-/**
-* This filter converts ThML text to HTML text
-*/
-class BT_ThMLHTML : public sword::ThMLHTML, protected CFilterTool {
-protected:
-  class BT_UserData : public sword::ThMLHTML::MyUserData {
-  public:
-    BT_UserData(const sword::SWModule *module, const sword::SWKey *key) : sword::ThMLHTML::MyUserData(module, key) {}
-    
-    bool inscriptRef;
-  };
-  
-  virtual sword::BasicFilterUserData *createUserData(const sword::SWModule* module, const sword::SWKey* key) {
-    return new BT_UserData(module, key);
-  }
-
-public:
-  BT_ThMLHTML ();
-  virtual bool handleToken(sword::SWBuf &buf, const char *token, sword::BasicFilterUserData *userData);
-//  virtual char ProcessText (char *text, int maxlen = -1);
-};
-
-#endif
diff --git a/bibletime/backend/centrydisplay.cpp b/bibletime/backend/centrydisplay.cpp
deleted file mode 100644
index e70bae0..0000000
--- a/bibletime/backend/centrydisplay.cpp
+++ /dev/null
@@ -1,568 +0,0 @@
-/***************************************************************************
-                          centrydisplay.cpp  -  description
-                             -------------------
-    begin                : Fre Mai 31 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "centrydisplay.h"
-#include "cswordkey.h"
-#include "cswordversekey.h"
-#include "cswordbookmoduleinfo.h"
-#include "creferencemanager.h"
-
-#include "frontend/cbtconfig.h"
-
-#include "util/scoped_resource.h"
-
-//Qt includes
-#include <qapplication.h>
-
-CEntryDisplay::CEntryDisplay(){
-}
-
-CEntryDisplay::~CEntryDisplay(){
-}
-
-/** Returns the rendered text using the modules in the list and using the key parameter. The displayoptions and filter options are used, too. */
-const QString CEntryDisplay::text( QPtrList<CSwordModuleInfo> modules, const QString& keyName, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) {
-  backend()->setDisplayOptions( displayOptions );
-  backend()->setFilterOptions( filterOptions );
-
-  const QString entry = entryText(modules, keyName);
-  return finishText( entry, modules, keyName );
-}
-
-/** Returns a preview for the given module and key. This is useful for the seatchdialog and perhaps the tooltips. */
-const QString CEntryDisplay::previewText( CSwordModuleInfo*  module, const QString& keyName, const QString& headerText, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions){
-  backend()->setDisplayOptions( displayOptions );
-  backend()->setFilterOptions( filterOptions );
-
-  util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-  key->key(keyName);
-
-  QString css = QString::null;
-  for (int t = MinType; t <= MaxType; ++t) {
-    css += "\t" + cssString( static_cast<CEntryDisplay::StyleType>(t) );
-  }
-
-  const QString pageStart = QString::fromLatin1("<html><head><style type=\"text/css\">%1</style></head><body>%2<hr/>")
-    .arg(css)
-    .arg(headerText);
-
-  const QString text = QString::fromLatin1("<div %1>%2</div>")
-    .arg(module->textDirection() == CSwordModuleInfo::RightToLeft ? QString::fromLatin1("dir=\"rtl\"") : QString::null)
-//    .arg(module->isUnicode() ? QString::fromLatin1("class=\"unicodetext\"") : QString::null)
-    .arg(key->renderedText());
-
-  const QString pageEnd = QString::fromLatin1("</body></html>");
-  return pageStart + text + pageEnd;
-}
-
-/** Renders one entry using the given modules and the key. This makes chapter rendering more easy. */
-const QString CEntryDisplay::entryText( QPtrList<CSwordModuleInfo> modules, const QString& keyName){
-//	Q_ASSERT(modules.first());
-  util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(modules.first()) );
-  key->key(keyName);
-  QString renderedText = QString::null;
-
-  QFont moduleFont;
-  QString tdStyle;
-  
-  renderedText = QString::fromLatin1("<tr valign=\"top\">");
-  for (CSwordModuleInfo* m = modules.first(); m; m = modules.next()) {
-    moduleFont = CBTConfig::get( m->language() ).second;
-    tdStyle = QString::fromLatin1("style=\"%1 %2 font-family:%3; font-size:%4pt;\"")
-      .arg(((modules.at()+1) < (int)modules.count()) ? QString::fromLatin1("padding-right:2mm; border-right:1px solid black;") : QString::null)
-      .arg(((modules.at()>0) && ((modules.at()+1) <= (int)modules.count() )) ? QString::fromLatin1("padding-left:2mm;") : QString::null)
-      .arg(moduleFont.family())
-      .arg(moduleFont.pointSize());
-
-    key->module(m);
-    key->key(keyName);
-
-    renderedText += QString::fromLatin1("<td %1 valign=\"top\">%2</td>")
-                      .arg(tdStyle)
-                      .arg(key->renderedText());
-  }
-  renderedText += QString::fromLatin1("</tr>");
-  return renderedText;
-}
-
-/** Returns the color of the given type. */
-const QColor CEntryDisplay::color( const CEntryDisplay::ColorType type ) {
-  switch (type) {
-    case ReferenceColor:
-      return CBTConfig::get(CBTConfig::swordRefColor);
-    case TextColor:
-      return CBTConfig::get(CBTConfig::textColor);
-    case HighlightedTextColor:
-      return CBTConfig::get(CBTConfig::highlightedVerseColor);
-    case BackgroundColor:
-      return CBTConfig::get(CBTConfig::backgroundColor);
-    case FootnoteColor:
-      return CBTConfig::get(CBTConfig::footnotesColor);
-    case StrongsNumberColor:
-      return CBTConfig::get(CBTConfig::strongsColor);
-    case MorphCodeColor:
-      return CBTConfig::get(CBTConfig::morphsColor);
-    case JesusWordColor:
-      return CBTConfig::get(CBTConfig::jesuswordsColor);
-    default:
-      return Qt::white;
-  }
-}
-
-/** Returns the font of the given type. */
-const QFont CEntryDisplay::font( const CLanguageMgr::Language& lang ) {
-  return CBTConfig::get(lang).second;
-}
-
-/** Adds the right headers and footers to the page and returns them together. */
-const QString CEntryDisplay::finishText( const QString text, QPtrList <CSwordModuleInfo> modules, const QString& keyName){
-  CSwordModuleInfo* module = modules.first();
-  Q_ASSERT(module); //shouldn't happen
-  util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(modules.first()) );
-  key->key(keyName);
-
-  QString css = "table.maintable {width:100%;} td.tableheading {border-bottom:1px solid black;}";
-  for (int t = MinType; t <= MaxType; ++t) {
-    css += "\t" + cssString( static_cast<CEntryDisplay::StyleType>(t) ) + "\n\n";
-  }
-
-  const int columnWidth = (int)((float)100 / (float)modules.count());
-
-  QString pageStart = QString::fromLatin1("<html><head><style type=\"text/css\">%1</style></head><body><table cellspacing=\"0\" class=\"maintable\"><tr>")
-    .arg(css);
-
-  for (CSwordModuleInfo* m = modules.first(); m; m = modules.next()) {
-    key->module(m);
-    const QString newKeyName = key->key();
-    pageStart += QString::fromLatin1("<td class=\"tableheading\" width=\"%1%\"><center><b>%2</b> %3</center></td>")
-      .arg(columnWidth)
-      .arg(m->name())
-      .arg(!newKeyName.isEmpty() ? QString::fromLatin1("(%1)").arg(htmlReference(m, newKeyName, newKeyName, newKeyName)) : QString::null);
-  }
-  pageStart += QString::fromLatin1("</tr>");
-
-  const QString pageEnd = QString::fromLatin1("</table></body></html>");
-
-  return pageStart + text + pageEnd;
-}
-
-const QString CEntryDisplay::cssString( const CEntryDisplay::StyleType type ){
-  const QString bgColor = color(BackgroundColor).name();
-
-  const QString textColor = color(TextColor).name();
-  const QString highlightColor = color(HighlightedTextColor).name();
-  const QString swordRefColor = color(ReferenceColor).name();
-  const QString footnotesColor = color(FootnoteColor).name();
-
-  const QString strongsColor = color(StrongsNumberColor).name();
-  const QString morphsColor = color(MorphCodeColor).name();
-//  const QString lemmaColor = color(LemmaColor).name();
-
-  const QString jesusWordsColor = color(JesusWordColor).name();
-
-
-  QString text;
-  switch(type) {
-    case Body:
-//      text =  QString::fromLatin1("body {%1; color: %2; font-size: %3pt; font-family: %4;}")
-//                .arg(QString::fromLatin1("background-color: %1").arg(bgColor))
-//                .arg(textColor)
-//                .arg(font(StandardFont).pointSize())
-//                .arg(font(StandardFont).family());
-      text =  QString::fromLatin1("body {background-color:%1; color:%2;}")
-                .arg(bgColor)
-                .arg(textColor);
-      break;
-    case Link:
-      text = QString::fromLatin1("a:link {text-decoration:none;}");
-//              .arg(swordRefColor);
-      break;
-    case LinkHover:
-      text = QString::fromLatin1("a:hover {text-decoration:none;}");
-      break;
-    case Background:
-      text = QString::fromLatin1(".background1 {background-color:%1;}")
-              .arg(bgColor);
-      break;
-//    case Background2:
-//      text = QString::fromLatin1(".background2 {background-color:%1;}")
-//              .arg(bgColor2);
-//      break;
-    case HighlightedText:
-      text = QString::fromLatin1(".highlighted {color: %1;}")
-              .arg(highlightColor);
-      break;
-    case UnicodeText:
-//      text = QString::fromLatin1(".unicodetext { font-family: %1; font-size:%2pt; }")
-//                .arg(font(UnicodeFont).family())
-//                .arg(font(UnicodeFont).pointSize());
-      break;
-    case Reference:
-      text = QString::fromLatin1(".reference {color:%1; font-weight:light; font-size:small;}")
-              .arg(swordRefColor);
-      break;
-    case MorphCode:
-      text = QString::fromLatin1(".morphcode {font-size: smaller; color: %1; font-decoration:none;}")
-              .arg(morphsColor);
-      break;
-    case StrongNumber:
-      text = QString::fromLatin1(".strongnumber {font-size: smaller; color: %1; font-decoration:none;}")
-              .arg(strongsColor);
-      break;
-    case Lemma:
-//      text = QString::fromLatin1(".lemma {font-size: smaller; color: %1; font-decoration:none;}")
-//              .arg(lemmaColor);
-      break;
-    case Footnote:
-      text = QString::fromLatin1(".footnote  {font-size:smaller; color:%1; font-style:italic;}")
-              .arg(footnotesColor);
-      break;
-    case FootnotePre:
-      text = QString::fromLatin1(".footnotepre {font-size:smaller; color:%1; font-weight:bolder;}")
-              .arg(footnotesColor);
-      break;
-    case Poetry:
-      text = QString::fromLatin1(".poetry {font-weight:lighter; alignment:justify;}");
-      break;
-    case Quotation:
-      text = QString::fromLatin1(".quotation {font-style:italic;}");
-      break;
-    case JesusWords:
-      text = QString::fromLatin1(".jesuswords {font-style:italic; color:%1;}")
-              .arg(jesusWordsColor);
-      break;
-    case BookTitle:
-      text = QString::fromLatin1(".booktitle {font-weight:x-bold; font-size:x-large; color:%1; margin-top:1mm; margin-bottom:1mm;}")
-              .arg(textColor);
-      break;
-    case SectionTitle:
-      text = QString::fromLatin1(".sectiontitle {font-size:larger; font-weight:bold; color:%1;}")
-              .arg(textColor);
-      break;
-    default:      
-      break;
-  };
-  return QString::fromLatin1("%1\n").arg(text);
-}
-
-void CEntryDisplay::setDisplayOptions(const CSwordBackend::DisplayOptions options) {
-  m_displayOptions = options;
-}
-
-/** Returns the right reference text which can be incluced in the HTML */
-const QString CEntryDisplay::htmlReference( CSwordModuleInfo* module, const QString& keyName, const QString linkText, const QString& anchorText ) {
-  if (linkText.isEmpty()) {
-    return QString::fromLatin1("<a name=\"%1\"></a>").arg(anchorText);
-  }
-  else {
-    return QString::fromLatin1("<a name=\"%1\" href=\"%2\">%3</a>")
-      .arg(anchorText)
-      .arg(CReferenceManager::encodeHyperlink(module->name(), keyName, CReferenceManager::typeFromModule(module->type()) ))
-      .arg(linkText);
-  }
-}
-
-/* ----------------------- new class: CChapterDisplay ------------------- */
-
-/** Returns the rendered text using the modules in the list and using the key parameter. The displayoptions and filter options are used, too. */
-const QString CChapterDisplay::text( QPtrList <CSwordModuleInfo> modules, const QString& keyName, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) {
-  backend()->setDisplayOptions( displayOptions );
-  backend()->setFilterOptions( filterOptions );
-  QString text = QString::null;
-
-  CSwordVerseKey key(0);
-  key = keyName;
-
-  const int currentTestament = key.Testament();	
-	const int currentBook = key.Book();
-	const int currentChapter = key.Chapter();
-	
-  CSwordModuleInfo* module = modules.first();
-  bool ok = true;
-  
-	for (key.Verse(1); key.Testament() == currentTestament && key.Book() == currentBook && key.Chapter() == currentChapter && ok && !module->module()->Error(); ok = key.next(CSwordVerseKey::UseVerse) && !key.Error() ) {
-    text += entryText(modules, key.key(), keyName);
-	}
-
-//  qWarning(finishText(text, modules, QString::null).latin1());
-  return finishText(text, modules, QString::null);
-}
-
-/** Renders one entry using the given modules and the key. This makes chapter rendering more easy. */
-const QString CChapterDisplay::entryText( QPtrList<CSwordModuleInfo> modules, const QString& keyName, const QString& chosenKey ) {
-
-  CSwordVerseKey key(modules.first());
-  QString renderedText = (modules.count() > 1) ? QString::fromLatin1("<tr valign=\"top\">") : QString::null;
-
-	// Only insert the table stuff if we are displaying parallel.
-  // Otherwise, strip out he table stuff -> the whole chapter will be rendered in one cell!
-
-
-  //declarations out of the loop for optimization
-  const QString colStyle = QString::fromLatin1("style=\"border-bottom:1px solid black; padding-bottom:2px; padding-top:2px;");
-  QString tdStyle;
-  QString entry;
-  QString keyText;
-
-  QFont font;
-  bool isRTL;
-
-  const QString lineBreakString = ((modules.count() == 1) && m_displayOptions.lineBreaks) ? QString::fromLatin1("<br/>") : QString::fromLatin1(" ");
-
-  for (CSwordModuleInfo* m = modules.first(); m; m = modules.next()) {
-    key.module(m);
-    key.key(keyName);
-    keyText = key.key();
-    isRTL = (m->textDirection() == CSwordModuleInfo::RightToLeft);
-
-    tdStyle = colStyle + QString::fromLatin1("%1 %2\"")
-      .arg((modules.at()+1 < (int)modules.count()) ? QString::fromLatin1("padding-right: 2mm; border-right: 1px solid black;") : QString::null)
-      .arg((modules.at()>0 && modules.at()+1 <= modules.count()) ? QString::fromLatin1("padding-left:2mm;") : QString::null);
-
-    font = CBTConfig::get(m->language()).second;
-
-		entry = QString::null;
-
-	//	m->module()->RenderText(); //force rendering of entry attributes
-		key.renderedText();
-		int pvHeading = 0;
-		do { //add sectiontitle before we add the versenumber
-			QString preverseHeading = QString::fromUtf8(
-m->module()->getEntryAttributes()["Heading"]["Preverse"][QString::number(pvHeading++).latin1()].c_str());
-			if (!preverseHeading.isEmpty()) {
-				entry += QString::fromLatin1("<br/><div class=\"sectiontitle\">%1</div>")
-					.arg(preverseHeading);
-			}
-			else {
-				break;
-			}
-		} while (true);
-
-    entry +=
-      QString::fromLatin1("<span %1 style=\"font-family:%2;font-size:%3pt;\" dir=\"%4\">%5%6</span>")
-        .arg((keyText == chosenKey) ? QString::fromLatin1("class=\"highlighted\"") : QString::null)
-        .arg(font.family())
-        .arg(font.pointSize())
-        .arg(isRTL ? QString::fromLatin1("rtl") : QString::fromLatin1("ltr"))
-        .arg(m_displayOptions.verseNumbers //if we shuld show the verse numbers
-            ? QString::fromLatin1("<span style=\"vertical-align:text-top; font-size:%1pt;\">%2</span> ")
-                .arg(int(float(font.pointSize()) / 1.5))
-                .arg(htmlReference(m, keyText, QString::number(key.Verse()), keyText))
-            : htmlReference(m, QString::null, QString::null, keyText) )
-        .arg(key.renderedText() + lineBreakString);
-
-  	if (modules.count() == 1) {
-			renderedText += entry;
-		}
-  	else {
-	    renderedText += QString::fromLatin1("<td class=\"background1\" %1 dir=\"%2\" valign=\"top\">%3</td>")
-                        .arg(tdStyle)
-                        .arg(isRTL ? QString::fromLatin1("rtl") : QString::fromLatin1("ltr"))
-											  .arg(entry);
-		}
-  }
-
-  if (modules.count() > 1){
-		renderedText += QString::fromLatin1("</tr>");
-	}
-
-  return renderedText;
-}
-
-const QString CChapterDisplay::finishText( const QString text, QPtrList <CSwordModuleInfo> modules, const QString& keyName) {
-  util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(modules.first()) );
-  key->key(keyName);
-
-  QString css = "table.maintable {width:100%;} td.tableheading {border-bottom:1px solid black;}";
-  for (int t = MinType; t <= MaxType; ++t) {
-    css += "\t" + cssString( static_cast<CEntryDisplay::StyleType>(t) );
-  }
-
-  const int columnWidth = (int)((float)100 / (float)modules.count());
-
-  QString pageStart = QString::fromLatin1("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"><html><head><style type=\"text/css\">%1</style></head><body><table cellspacing=\"0\" class=\"maintable\" %2><tr>")
-    .arg(css)
-    .arg(((modules.count() == 1) && (modules.first()->textDirection() == CSwordModuleInfo::RightToLeft)) ? "dir=\"rtl\"" : "");
-
-  for (CSwordModuleInfo* m = modules.first(); m; m = modules.next()) {
-    key->module(m);
-    const QString newKeyName = key->key();
-
-    pageStart += QString::fromLatin1("<td class=\"tableheading\" width=\"%1%\"><center><b>%2</b> %3</center></td>")
-      .arg(columnWidth)
-      .arg(m->name())
-      .arg(!keyName.isEmpty() ? htmlReference(m, newKeyName, newKeyName, newKeyName) : QString::null);
-  }
-  pageStart += QString::fromLatin1("</tr>");
-
-  QString pageEnd = QString::fromLatin1("</table></body></html>");
-
-	if (modules.count() == 1) // render everything into one cell. entryText leaves out the table tags.
-		return pageStart  + QString::fromLatin1("<tr><td>%1</td></tr>%2").arg(text).arg(pageEnd);
-  else  // use many cells. entryText inserts the necessary table tags.
-	 	return pageStart + text + pageEnd;
-}
-
-/* ----------------------- new class: CBookDisplay ------------------- */
-
-/** Returns the rendered text using the modules in the list and using the key parameter. The displayoptions and filter options are used, too. */
-const QString CBookDisplay::text( QPtrList <CSwordModuleInfo> modules, const QString& keyName, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) {
-  backend()->setDisplayOptions( displayOptions );
-  backend()->setFilterOptions( filterOptions );
-
-	CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(modules.first());
-
-  // the number of levels which should be display together, 1 means display no entries together
-  int displayLevel = book->config( CSwordModuleInfo::DisplayLevel ).toInt();
-
-  util::scoped_ptr<CSwordTreeKey> key(
-		dynamic_cast<CSwordTreeKey*>( CSwordKey::createInstance(book) )
-	);
-  key->key(keyName); //set the key to position we'd like to get
-
-  // standard of DisplayLevel, display nothing together
-  // if the current key is the root entry don't display anything together!
-  if ((displayLevel <= 1) || (key->key().isEmpty() || (key->key() == "/") )) {
-		QString ret = finishText(entryText(modules, key) , modules, keyName );
-  	key->key(keyName); //restore before we return so make sure it doesn't break anything
-    return ret;
-  };
-
-  /**
-  * Check whether displaying displayLevel levels together is possible.
-	* For this count the childs and parents
-  * of the required position
-  */
-
-  int possibleLevels = 1; //we start with the default value of displayLevel, which means no entries together
-  while( key->parent() && (key->key() != "/") && !key->key().isEmpty() ) {//add parents
-    ++possibleLevels;
-  };
-  key->key(keyName); //set the key to the start position
-  while( key->firstChild( )) { //add childs
-    ++possibleLevels;
-  };
-
-  if (possibleLevels < displayLevel) { //too few levels available!
-    //display current level, we could also decide to display the available levels together
-    return finishText( entryText(modules, key), modules, keyName );
-  };
-  if ((displayLevel > 2) && (displayLevel == possibleLevels)) { //fix not to diplay the whole module
-    --displayLevel;
-  }
-
-  // at this point we're sure that we can display the required levels toogether
-  // at the moment we're at the lowest level, so we only have to go up!
-  for (int currentLevel = 1; currentLevel < displayLevel; ++currentLevel) { //we start again with 1 == standard of displayLevel
-    if (!key->parent()) { //something went wrong althout we checked before! Be safe and return entry's text
-      return finishText( entryText(modules, key), modules, keyName );
-    };
-  };
-
-  // no we can display all sub levels together! We checked before that this is possible!
-  m_text = entryText(modules, key, 0, (key->key() == keyName));
-
-  const bool hasToplevelText = !key->strippedText().isEmpty();
-
-  key->firstChild(); //go to the first sibling on the same level
-  m_chosenKey = keyName;
-
-  printTree(key, modules, hasToplevelText); //if the top level entry has text ident the other text
-
-	key->key(keyName); //restore key
-  return finishText(m_text, modules, keyName);
-}
-
-/** Renders one entry using the given modules and the key. This makes chapter rendering more easy. */
-const QString CBookDisplay::entryText( QPtrList<CSwordModuleInfo> modules, CSwordTreeKey* const key, const int level, const bool activeKey){
-  /**
-  * we have to be careful that we don't change the value of the key! We pass pointers for optimizations reasons,
-  * since entryText is called many times!
-  * creating copies of the key object takes too long
-  */
-	CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(modules.first());
-	Q_ASSERT( book );
-
-  const QFont font = CBTConfig::get(book->language()).second;
-  const QString& keyName = key->getFullName();
-
-  return QString::fromLatin1("<tr><td style=\"padding-left:%1px;\"><sup>%2</sup> %3</td></tr>")
-    .arg( level*30 )
-    .arg( htmlReference(book, keyName, key->getLocalName(), !keyName.isEmpty() ? keyName : "/" ) )
-    .arg( QString::fromLatin1("<span %1 style=\"font-family:%2; font-size:%3pt;\">%4</span>")
-            .arg(activeKey ? "class=\"highlighted\"" : QString::null)
-            .arg(font.family())
-            .arg(font.pointSize())
-            .arg(key->renderedText())
-    );
-}
-
-void CBookDisplay::printTree(CSwordTreeKey* const treeKey, QPtrList<CSwordModuleInfo> modules, const int levelPos){
-  // make sure we don't change the value of the key!
-
-  //static for performance reasons, static is faster because the
-  //initialization isn't executed more than one time
-  static QString fullKeyName;
-  fullKeyName = treeKey->getFullName();
-
-  m_text += entryText(modules, treeKey, levelPos, (m_chosenKey == fullKeyName));
-
-  if (treeKey->hasChildren()) { //print tree for the child items
-    treeKey->firstChild();
-    printTree(treeKey, modules, levelPos+1); //doesn't change the value of the key! (this function)
-    treeKey->key(fullKeyName); //go back where we came from
-  }
-
-  if (treeKey->nextSibling()) { //print tree for next entry on the same depth
-		printTree(treeKey, modules, levelPos);
-    treeKey->key(fullKeyName); //return to the value we had at the beginning of this block!
-  }
-}
-
-const QString CBookDisplay::finishText( const QString text, QPtrList <CSwordModuleInfo> modules, const QString& keyName) {
- 	CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(modules.first());
-  util::scoped_ptr<CSwordTreeKey> key(
-		dynamic_cast<CSwordTreeKey*>( CSwordKey::createInstance(book) )
-	);
-  key->key(keyName);
-
-  QString css = "table.maintable {width:100%;} td.tableheading {border-bottom: thin solid black;}";
-  for (int t = MinType; t <= MaxType; ++t) {
-    css += "\t" + cssString( static_cast<CEntryDisplay::StyleType>(t) ) + "\n\n";
-  }
-
-  const int columnWidth = (int)((float)100 / (float)modules.count());
-
-  QString pageStart = QString::fromLatin1("<html><head><style type=\"text/css\">%1</style></head><body><table cellspacing=\"0\" class=\"maintable\"><tr>")
-    .arg(css);
-
-  for (CSwordModuleInfo* m = modules.first(); m; m = modules.next()) {
-    key->module(m);
-    const QString newKeyName = !key->key().isEmpty() ? key->key() : "/";
-
-    pageStart += QString::fromLatin1("<td class=\"tableheading\" width=\"%1%\"><center><b>%2</b> %3</center></td>")
-      .arg(columnWidth)
-      .arg(m->name())
-      .arg(!newKeyName.isEmpty() ? QString::fromLatin1("(%1)").arg(htmlReference(m, newKeyName, newKeyName, QString::null)) : QString::null);
-  }
-	pageStart += QString::fromLatin1("</tr>");
-
-  const QString pageEnd = QString::fromLatin1("</table></body></html>");
-
-  return pageStart + text + pageEnd;
-}
diff --git a/bibletime/backend/centrydisplay.h b/bibletime/backend/centrydisplay.h
deleted file mode 100644
index 8cdadad..0000000
--- a/bibletime/backend/centrydisplay.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/***************************************************************************
-                          centrydisplay.h  -  description
-                             -------------------
-    begin                : Fre Mai 31 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CENTRYDISPLAY_H
-#define CENTRYDISPLAY_H
-
-//BibleTime includes
-#include "cswordbackend.h"
-#include "cswordmoduleinfo.h"
-#include "cswordtreekey.h"
-
-#include "util/cpointers.h"
-#include "frontend/cbtconfig.h"
-
-//Sword includes
-#include <swdisp.h>
-
-//Qt includes
-#include <qstring.h>
-#include <qfont.h>
-#include <qcolor.h>
-#include <qptrlist.h>
-
-/**The reimplementation of SWDisplay to fir our needs.
-  *@author The BibleTime team
-  */
-
-class CEntryDisplay : public sword::SWDisplay, public CPointers  {
-public: // Public methods
-  enum StyleType {
-    Body = 0,
-    Font,
-    Link,
-    LinkHover,
-    Background,
-//    Background2,
-    HighlightedText,
-    UnicodeText,
-
-    Reference,
-
-    MorphCode,
-    StrongNumber,
-    Lemma,
-    Footnote,
-    FootnotePre,
-
-    Poetry,
-    Quotation,
-    JesusWords,
-
-    BookTitle,
-    SectionTitle,
-
-    MinType = Body,
-    MaxType = SectionTitle
-  };
-
-//  enum FontType {
-//    UnicodeFont,
-//    StandardFont
-//  };
-
-  enum ColorType {
-    ReferenceColor,
-    TextColor,
-    HighlightedTextColor,
-    BackgroundColor,
-    BackgroundColor2,
-
-    FootnoteColor,
-    StrongsNumberColor,
-    MorphCodeColor,
-    LemmaColor,
-    JesusWordColor
-  };
-
-  CEntryDisplay();
-	virtual ~CEntryDisplay();
-  /**
-  * Returns the rendered text using the modules in the list and using the key parameter.
-  *  The displayoptions and filter options are used, too.
-  */
-  virtual const QString text( QPtrList <CSwordModuleInfo> modules, const QString& key, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions);
-  /**
-  * Returns a preview for the given module and key.
-  * This is useful for the seatchdialog and perhaps the tooltips.
-  */
-  virtual const QString previewText( CSwordModuleInfo*  module, const QString& key, const QString& headerText = QString::null,  CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults(), CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults());
-  void setDisplayOptions(const CSwordBackend::DisplayOptions options);
-
-  /**
-  * Returns the font of the given type.
-  */
-  const QFont font( const CLanguageMgr::Language& lang );
-  /**
-  * Returns the color of the given type.
-  */
-  const QColor color( const CEntryDisplay::ColorType type );
-  const QString cssString( const CEntryDisplay::StyleType type );
-
-
-protected:
-  /**
-  * Renders one entry using the given modules and the key.
-  * This makes chapter rendering more easy.
-  */
-  virtual const QString entryText( QPtrList<CSwordModuleInfo> modules, const QString& key);
-  /**
-  * Adds the right headers and footers to the page and returns them together.
-  */
-  virtual const QString finishText( const QString text, QPtrList <CSwordModuleInfo> modules, const QString& keyName);
-  /**
-  * Returns the right reference text which can be incluced in the HTML
-  */
-  const QString htmlReference( CSwordModuleInfo* module, const QString& keyName, const QString linkText, const QString& anchorText );
-
-  CSwordBackend::DisplayOptions m_displayOptions;
-};
-
-class CChapterDisplay : public CEntryDisplay  {
-public: // Public methods
-  /**
-  * Returns the rendered text using the modules in the list and using the key parameter.
-  *  The displayoptions and filter options are used, too.
-  */
-  virtual const QString text( QPtrList <CSwordModuleInfo> modules, const QString& key, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions);
-
-protected:
-  /**
-  * Renders one entry using the given modules and the key.
-  * This makes chapter rendering more easy.
-  */
-  virtual const QString entryText( QPtrList<CSwordModuleInfo> modules, const QString& key, const QString& chosenKey);
-  /**
-  * Adds the right headers and footers to the page and returns them together.
-  */
-  virtual const QString finishText( const QString text, QPtrList <CSwordModuleInfo> modules, const QString& keyName);
-};
-
-class CBookDisplay : public CEntryDisplay  {
-public: // Public methods
-  /**
-  * Returns the rendered text using the modules in the list and using the key parameter.
-  *  The displayoptions and filter options are used, too.
-  */
-  virtual const QString text( QPtrList <CSwordModuleInfo> modules, const QString& key, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions);
-
-protected:
-  /**
-  * Renders one entry using the given modules and the key.
-  * This makes chapter rendering more easy.
-  *
-  * Please be careful not to change the value of "key"!
-  */
-  virtual const QString entryText( QPtrList<CSwordModuleInfo> modules, CSwordTreeKey* const key, const int level = 0, const bool activekey = false);
-  /**
-  * Creates the text by processing all tree items.
-  */
-  void printTree(CSwordTreeKey* const treeKey, QPtrList<CSwordModuleInfo> modules, const int levelPos = 0);
-  virtual const QString finishText( const QString text, QPtrList <CSwordModuleInfo> modules, const QString& keyName);
-
-private:
-  QString m_text;
-  QString m_chosenKey;
-};
-#endif
diff --git a/bibletime/backend/cfiltertool.cpp b/bibletime/backend/cfiltertool.cpp
deleted file mode 100644
index d3ab26d..0000000
--- a/bibletime/backend/cfiltertool.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/***************************************************************************
-                          cfiltertool.cpp  -  description
-                             -------------------
-    begin                : Don Jul 10 2003
-    copyright            : (C) 2003 by The BibleTime team
-    email                : info@bibletime.info
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cfiltertool.h"
-#include "creferencemanager.h"
-
-#include <qregexp.h>
-#include <qstring.h>
-
-
-#include <string>
-
-using std::string;
-
-CFilterTool::CFilterTool() {
-  updateSettings();
-}
-
-CFilterTool::~CFilterTool(){
-}
-
-void CFilterTool::updateSettings(){
-	m_standardBible = CReferenceManager::preferredModule(CReferenceManager::Bible);
-}
-
-const sword::SWBuf CFilterTool::thmlRefEnd(){
-	return "</a></span>";
-}
-
-char CFilterTool::ProcessRWPRefs(sword::SWBuf & buf, sword::SWModule* const module){
-  /** Markup verse refs which are marked by #ref1[,;]ref2|
-  *
-  * 1. Search start marker (#)
-  * 2. Search end marker (|)
-  * 3. Replace found ref by parsed result!
-  */
-
-  std::string target(buf.c_str());
-  unsigned int idx_start = target.find_first_of("#",0); //find ref start
-  unsigned int idx_end;
-
-  while (idx_start != std::string::npos) {
-    idx_end = target.find_first_of("|", idx_start); //find end marker
-
-    if ((idx_end != std::string::npos) && (idx_end > idx_start+1)) { //found marker with content
-      // Our length of the ref without markers is idx_end - (idx_start+1) = idx_end - idx_start - 1
-
-      // Parse ref without start and end markers!
-      const string ref = string(parseRef( target.substr(idx_start + 1, idx_end - idx_start - 1).c_str(),  module, 0 ).c_str());
-
-      // Replace original ref sourrounded by # and | by the parsed ref in target!
-      target.replace( idx_start, idx_end - idx_start + 1, ref ); //remove marker, too
-
-      // Start searching for next ref start behind current one! It's faster!
-      idx_start += ref.length();
-    }
-
-    idx_start = target.find_first_of("#", idx_start); //find ref start
-  };
-
-  buf = target.c_str(); //copy new content back into text!
-  return 0;
-}
-
-/** Parses the verse reference ref and returns it. */
-const sword::SWBuf CFilterTool::parseRef(const sword::SWBuf ref, sword::SWModule * const module, sword::SWKey * const key, const char* lang, const bool insertFullRef){
-  /**
-  * This function should be able to parse references like "John 1:3; 3:1-10; Matthew 1:1-3:3"
-  * without problems.
-  */
-  const sword::SWBuf moduleName( module ? module->Name() : m_standardBible.latin1() );
-
-  sword::VerseKey parseKey;
- 	parseKey.setLocale( lang ? lang : (module ? module->Lang() : "en") ); //we assume that the keys are in english or in the module's language
-
- 	parseKey = key ? (const char*)*key : "Genesis 1:1"; //use the current key if there's any
-  
- 	sword::ListKey list;
-  sword::SWBuf ret;
-
-  QStringList refList = QStringList::split(QRegExp("[,.;]|(?:\\s(?=\\d?[A-Z]))", false), QString::fromLocal8Bit(ref.c_str()));
-	int pos = 0;
-
-  if ( !insertFullRef && (refList.count() >= 1) ) {
-    /* We can't handle refs which defined their own caption if we would have to insert multiple refs
-    * If our own caption should not be inserted and we have more than one ref return so the original
-    * ref and caption will be used.
-    */
-    return sword::SWBuf("<span id=\"reference\"><a href=\"sword://Bible/") + moduleName + "/" + ref + "\">";
-  }
-
-	for ( QStringList::Iterator it = refList.begin(); it != refList.end(); ++it, pos++ ) {
-	 	list = parseKey.ParseVerseList((*it).local8Bit(), parseKey, true);
-
-	 	const int count = list.Count();
-    sword::SWKey* key = 0;
-	 	for(int i = 0; i < count; i++) {
-	 		key = list.GetElement(i);
-//      qWarning("%s (%s) [%s] (%s)", key->getRangeText(), ref.c_str(), parseKey.getLocale(), module->Lang());
-  		ret += sword::SWBuf("<span id=\"reference\"><a href=\"sword://Bible/") + moduleName + "/";
- 			if ( sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key) ) {
- 				vk->setLocale("en");
-        ret += sword::SWBuf(vk->getRangeText()) + "\">";
-        parseKey = *vk;
-      }
-      else {
-        sword::VerseKey vk = key->getText();
- 				vk.setLocale("en");
-        ret += sword::SWBuf(vk.getRangeText()) + "\">";
-        parseKey = vk;
-      }
-
-      /* This is kind of a hack. This will only work if we process simple refs which won't get splitted.
-      * But since insertFullRef is true by default, the end markers will be left out only in special cases like ThML refs
-      * with own caption.
-      */
-      if (insertFullRef) { //HTML will only be valid if we hide only the end of one cross reference
-        ret += sword::SWBuf( (const char*)(*it).utf8() ) + "</a>";
-  	 		(pos+1 < (int)refList.count()) ? ret.append("</span>, ") : ret.append("</span>");
-      }
-	 	}
-
-	}
- 	return ret;
-}
-
-const sword::SWBuf CFilterTool::parseThMLRef(const sword::SWBuf& ref, const char* mod) {
-  updateSettings();
-
-  const char* moduleName = (mod ? mod : m_standardBible.latin1());
-  sword::SWModule* module = 0;
-  if ( CSwordModuleInfo* m = CPointers::backend()->findModuleByName(moduleName) ) {
-    module = m->module();
-  }
-  return parseRef( ref, module, 0, module ? module->Lang() : "en", false );
-}
-
-const sword::SWBuf CFilterTool::parseSimpleRef(const sword::SWBuf& ref, const char* lang) {
-  updateSettings();
-
-  if ( CSwordModuleInfo* m = CPointers::backend()->findModuleByName(m_standardBible.latin1()) ) {
-    return parseRef( ref, m->module(), 0, lang);
-  }
-  return sword::SWBuf();
-}
diff --git a/bibletime/backend/cfiltertool.h b/bibletime/backend/cfiltertool.h
deleted file mode 100644
index d627608..0000000
--- a/bibletime/backend/cfiltertool.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************
-                          cfiltertool.h  -  description
-                             -------------------
-    begin                : Don Jul 10 2003
-    copyright            : (C) 2003 by The BibleTime team
-    email                : info@bibletime.info
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CFILTERTOOL_H
-#define CFILTERTOOL_H
-
-#include "util/cpointers.h"
-
-#include "swmodule.h"
-#include "swkey.h"
-#include "swbuf.h"
-
-/**CFilterTool includes some functions to use filters from Sword without multiple virtual inheritance.
-  *@author The BibleTime team
-  */
-
-class CFilterTool : public CPointers  {
-public: 
-	CFilterTool();
-	virtual ~CFilterTool();
-
-protected: // Protected methods
-  /** 
-	* updates the filter specific settings like colors
-	* the variables are used in the inherited filters
-	* in HandleToken()
-	*/
-  void updateSettings();
-  /** 
-	* This filter converts the RWP #Gen 1:1|
-	* style bible references to HTML
-	*/
-  char ProcessRWPRefs(sword::SWBuf & buf, sword::SWModule* const module);
-  /** 
-  * parses the verse reference ref and returns it.
-  */
-  const sword::SWBuf thmlRefEnd();
-  /**
-  * Parses the verse reference ref and returns it.
-  */
-  const sword::SWBuf parseRef(const sword::SWBuf ref, sword::SWModule * const , sword::SWKey * const, const char* lang="en", const bool insertFullRef = true);
-  /**
-  * Parses the verse reference ref and returns it.
-  */
-  const sword::SWBuf parseThMLRef(const sword::SWBuf& ref, const char* mod = 0);
-  /**
-  * Parses the verse reference ref and returns it.
-  */
-  const sword::SWBuf parseSimpleRef(const sword::SWBuf& ref, const char* lang = 0);
-
-private:
-  QString m_standardBible;
-};
-
-#endif
diff --git a/bibletime/backend/clanguagemgr.cpp b/bibletime/backend/clanguagemgr.cpp
deleted file mode 100644
index 05f5e85..0000000
--- a/bibletime/backend/clanguagemgr.cpp
+++ /dev/null
@@ -1,424 +0,0 @@
-/***************************************************************************
-                          clanguagemgr.cpp  -  description
-                             -------------------
-    begin                : Mon Okt 21 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "clanguagemgr.h"
-
-#include "cswordmoduleinfo.h"
-
-#include "util/cpointers.h"
-
-//KDE includes
-#include <klocale.h>
-
-//initialize static language list
-static QValueList<CLanguageMgr::Language> m_langList;
-static CLanguageMgr::Language m_defaultLanguage;
-
-CLanguageMgr::Language::Language() {
-  m_abbrev = QString::null;
-  m_altAbbrevs = QStringList();
-  m_englishName = QString::null;
-  m_translatedName = QString::null;
-};
-
-CLanguageMgr::Language::Language( const QString& abbrev, const QString& name, const QString& translatedName, const QStringList altAbbrevs ) {
-  m_abbrev = abbrev;
-  m_altAbbrevs = altAbbrevs;
-  m_englishName = name;
-  m_translatedName = translatedName;
-};
-
-CLanguageMgr::Language::~Language() {
-};
-
-/** Returns true if this language object is valid, i.e. has an abbrev and name. */
-const bool CLanguageMgr::Language::isValid(){
-  return (!abbrev().isEmpty() && !name().isEmpty());
-}
-
-const QString& CLanguageMgr::Language::abbrev() const {
-  if (m_abbrev.isEmpty() && m_altAbbrevs.count()) { //no standard abbrev but alternative ones
-    return m_altAbbrevs.first();
-  };
-  return m_abbrev;
-};
-
-const QString& CLanguageMgr::Language::translatedName() const {
-  return m_translatedName;
-};
-
-const QStringList& CLanguageMgr::Language::alternativeAbbrevs() const {
-  return m_altAbbrevs;
-};
-
-const QPixmap CLanguageMgr::Language::flag() {
-  return QPixmap();
-};
-
-
-/****************************************************/
-/******************** CLanguageMgr ******************/
-/****************************************************/
-CLanguageMgr::CLanguageMgr(){
-  init();
-}
-
-CLanguageMgr::~CLanguageMgr(){
-}
-
-const CLanguageMgr::LangMap& CLanguageMgr::languages() const {
-  return m_langMap;
-};
-
-const CLanguageMgr::LangMap CLanguageMgr::availableLanguages() {
-  LangMap map;
-  
-  //collect the languages abbrevs of all modules
-  ListCSwordModuleInfo mods = CPointers::backend()->moduleList();
-  QStrList abbrevs;
-  char *abbrev;  
-
-  for (CSwordModuleInfo* m = mods.first(); m; m = mods.next()) {
-    abbrev = m->module()->Lang();
-    if (abbrev && !abbrevs.contains(abbrev)) {
-      abbrevs.append( abbrev );
-    }
-  };
-
-  //now create a map of available langs
-  Language lang;
-  for ( abbrev = abbrevs.first(); abbrev; abbrev = abbrevs.next() ) {
-    lang = languageForAbbrev(abbrev);
-    if (lang.isValid()) {
-      map.insert( abbrev, lang );
-    }
-    else {
-      map.insert( abbrev, Language(abbrev, abbrev, abbrev) );
-    }
-  };
-
-  return map;
-};
-
-const CLanguageMgr::Language& CLanguageMgr::languageForAbbrev( const QString& abbrev ) {
-  if (m_langMap.contains(abbrev)) {
-    return m_langMap[abbrev];
-  };
-
-  //try to search in the alternative abbrevs
-  LangMap::Iterator it;
-  for ( it = m_langMap.begin(); it != m_langMap.end(); ++it ) {
-    if (it.data().alternativeAbbrevs().contains(abbrev)) {
-      return it.data();
-    };
-  }  
-  return m_defaultLanguage; //invalid language
-};
-
-const CLanguageMgr::Language& CLanguageMgr::languageForName( const QString& name ) {
-  LangMap::Iterator it;
-  for ( it = m_langMap.begin(); it != m_langMap.end(); ++it ) {
-    if (it.data().name() == name) {
-      return it.data();
-    };
-  };
-  return m_defaultLanguage;//invalid language
-};
-
-const CLanguageMgr::Language& CLanguageMgr::languageForTranslatedName( const QString& name ) {
-  LangMap::Iterator it;
-  for ( it = m_langMap.begin(); it != m_langMap.end(); ++it ) {
-    if (it.data().translatedName() == name) {
-      return it.data();
-    };
-  };
-  return m_defaultLanguage;//invalid language
-};
-
-void CLanguageMgr::init() {
-  //if we've already inserted all items we do not proceed
-  if (m_langMap.count())
-    return;
-
-/*
-* Chris explained in an eMail how language codes are build:
-
-Preference order for locale codes are:
-
-ISO 639-1
-ISO 639-2
-Ethnologue (http://www.ethnologue.org/)
-
-We intend to always follow OSIS locale conventions, which state that
-Ethnologue codes will be encoded in the format x-E-??? where ???
-represents the 3-letter Ethnologue code in capital letters (though
-capitalization really doesn't matter here).
-
-Some older modules maintain a former format for Ethnolgoue codes of
-xx-???, including the AleWiesler module.
-
---Chris
-
-*/    
-    
-    
-//  m_langList.append( Language("aa"  , "Afar"        , i18n("Afar")) );
-//  m_langList.append( Language("ab"  , "Abkhazian"   , i18n("Abkhazian")) );
-//  m_langList.append( Language("ae"  , "Avestan"     , i18n("Avestan")) );
-  m_langList.append( Language("af"  , "Afrikaans"   , i18n("Afrikaans")) );
-//  m_langList.append( Language("am"  , "Amharic"     , i18n("Amharic")) );
-  m_langList.append( Language("ang", "English, Old (ca.450-1100)", i18n("English, Old (ca.450-1100)")) );
-  m_langList.append( Language("ar"  , "Arabic"      , i18n("Arabic")) );
-//  m_langList.append( Language("as"  , "Assamese"    , i18n("Assamese")) );
-//  m_langList.append( Language("ay"  , "Aymara"      , i18n("Aymara")) );
-  m_langList.append( Language("az"  , "Azerbaijani" , i18n("Azerbaijani")) );
-
-//  m_langList.append( Language("ba"  , "Bashkir"     , i18n("Bashkir")) );
-  m_langList.append( Language("be"  , "Belarusian"  , i18n("Belarusian")) );
-  m_langList.append( Language("bg"  , "Bulgarian"   , i18n("Bulgarian")) );
-//  m_langList.append( Language("bh"  , "Bihari"      , i18n("Bihari")) );
-//  m_langList.append( Language("bi"  , "Bislama"     , i18n("Bislama")) );
-//  m_langList.append( Language("bn"  , "Bengali"     , i18n("Bengali")) );
-//  m_langList.append( Language("bo"  , "Tibetan"     , i18n("Tibetan")) );
-  m_langList.append( Language("br"  , "Breton"      , i18n("Breton")) );
-  m_langList.append( Language("bs"  , "Bosnian"     , i18n("Bosnian")) );
-
-  m_langList.append( Language("ca"  , "Catalan"     , i18n("Catalan")) );
-//  m_langList.append( Language("ce"  , "Chechen"     , i18n("Chechen")) );
-  m_langList.append( Language("ceb"  , "Cebuano"     , i18n("Cebuano")) );
-//  m_langList.append( Language("ch"  , "Chamorro"    , i18n("Chamorro")) );
-//  m_langList.append( Language("co"  , "Corsican"    , i18n("Corsican")) );
-  m_langList.append( Language("cop" , "Coptic"         , i18n("Coptic")) );
-  m_langList.append( Language("cs"  , "Czech"       , i18n("Czech")) );
-  m_langList.append( Language("cu"  , "Church Slavic" , i18n("Church Slavic")) );
-//  m_langList.append( Language("cv"  , "Chuvash"     , i18n("Chuvash")) );
-  m_langList.append( Language("cy"  , "Welsh"       , i18n("Welsh")) );
-
-  m_langList.append( Language("da"  , "Danish"      , i18n("Danish")) );
-  m_langList.append( Language("de"  , "German"      , i18n("German")) );
-//  m_langList.append( Language("dz"  , "Dzongkha"    , i18n("Dzongkha")) );
-
-  m_langList.append( Language("el"  , "Greek, Modern (1453-)" , i18n("Greek, Modern (1453-)"), makeStringList("gre;ell")) );
-  m_langList.append( Language("en"  , "English"     , i18n("English")) );
-  m_langList.append( Language("en_US",  "American English"     , i18n("American English")) );
-  m_langList.append( Language("enm" , "English, Middle (1100-1500)", i18n("English, Middle (1100-1500)")) );
-  m_langList.append( Language("eo"  , "Esperanto"   , i18n("Esperanto")) );
-  m_langList.append( Language("es"  , "Spanish"     , i18n("Spanish")) );
-  m_langList.append( Language("et"  , "Estonian"    , i18n("Estonian")) );
-  m_langList.append( Language("eu"  , "Basque"      , i18n("Basque")) );
-
-//  m_langList.append( Language("fa"  , "Persian"     , i18n("Persian")) );
-  m_langList.append( Language("fi"  , "Finnish"     , i18n("Finnish")) );
-//  m_langList.append( Language("fj"  , "Fijian"      , i18n("Fijian")) );
-//  m_langList.append( Language("fo"  , "Faroese"     , i18n("Faroese")) );
-  m_langList.append( Language("fr"  , "French"      , i18n("French")) );
-  m_langList.append( Language("fy"  , "Frisian"     , i18n("Frisian")) );
-
-  m_langList.append( Language("ga"  , "Irish"       , i18n("Irish")) );
-  m_langList.append( Language("gd"  , "Gaelic (Scots)"     , i18n("Gaelic (Scots)")) );
-//  m_langList.append( Language("gl"  , "Gallegan"    , i18n("Gallegan")) );
-//  m_langList.append( Language("gn"  , "Guarani"     , i18n("Guarani")) );
-//  m_langList.append( Language("gn"  , "Gujarati"    , i18n("Gujarati")) );
-  m_langList.append( Language("got"  , "Gothic"    , i18n("Gothic")) );
-  m_langList.append( Language("gv"  , "Manx"        , i18n("Manx")) );
-  m_langList.append( Language("grc"  , "Greek, Ancient (to 1453)" , i18n("Greek, Ancient (to 1453)")) );
-
-  m_langList.append( Language("he"  , "Hebrew"      , i18n("Hebrew")) );
-  m_langList.append( Language("haw"    , "Hawaiian"    , i18n("Hawaiian")) );
-//  m_langList.append( Language("hi"  , "Hindi"       , i18n("Hindi")) );
-//  m_langList.append( Language("ho"  , "Hiri Motu"   , i18n("Hiri Motu")) );
-//  m_langList.append( Language("hr"  , "Croatian"    , i18n("Croatian")) );
-  m_langList.append( Language("hu"  , "Hungarian"   , i18n("Hungarian")) );
-  m_langList.append( Language("hy"  , "Armenian"    , i18n("Armenian")) );
-//  m_langList.append( Language("hz"  , "Herero"      , i18n("Herero")) );
-
-//  m_langList.append( Language("ia"  , "Interlingua" , i18n("Interlingua")) );
-  m_langList.append( Language("id"  , "Indonesian"  , i18n("Indonesian")) );
-//  m_langList.append( Language("ie"  , "Interlingue" , i18n("Interlingue")) );
-//  m_langList.append( Language("ik"  , "Inupiaq"     , i18n("Inupiaq")) );
-  m_langList.append( Language("is"  , "Icelandic"   , i18n("Icelandic")) );
-  m_langList.append( Language("it"  , "Italian"     , i18n("Italian")) );
-//  m_langList.append( Language("iu"  , "Inuktitut"   , i18n("Inuktitut")) );
-
-  m_langList.append( Language("ja"  , "Japanese"    , i18n("Japanese")) );
-
-  m_langList.append( Language("ka"  , "Georgian"    , i18n("Georgian")) );
-//  m_langList.append( Language("ki"  , "Kikuyu"      , i18n("Kikuyu")) );
-//  m_langList.append( Language("kj"  , "Kuanyama"    , i18n("Kuanyama")) );
-//  m_langList.append( Language("kk"  , "Kazakh"      , i18n("Kazakh")) );
-//  m_langList.append( Language("kl"  , "Kalaallisut" , i18n("Kalaallisut")) );
-//  m_langList.append( Language("km"  , "Khmer"       , i18n("Khmer")) );
-//  m_langList.append( Language("kn"  , "Kannada"     , i18n("Kannada")) );
-  m_langList.append( Language("ko"  , "Korean"      , i18n("Korean")) );
-//  m_langList.append( Language("ks"  , "Kashmiri"    , i18n("Kashmiri")) );
-  m_langList.append( Language("ku"  , "Kurdish"     , i18n("Kurdish")) );
-//  m_langList.append( Language("kv"  , "Komi"        , i18n("Komi")) );
-//  m_langList.append( Language("kw"  , "Cornish"     , i18n("Cornish")) );
-  m_langList.append( Language("ky"  , "Kirghiz"     , i18n("Kirghiz")) );
-
-  m_langList.append( Language("la"  , "Latin"       , i18n("Latin")) );
-//  m_langList.append( Language("lb"  , "Letzeburgesch" , i18n("Letzeburgesch")) );
-//  m_langList.append( Language("ln"  , "Lingala"     , i18n("Lingala")) );
-//  m_langList.append( Language("lo"  , "Lao"         , i18n("Lao")) );
-//  m_langList.append( Language("lt"  , "Lithuanian"  , i18n("Lithuanian")) );
-  m_langList.append( Language("lv"  , "Latvian"     , i18n("Latvian")) );
-
-//  m_langList.append( Language("mg"  , "Malagasy"    , i18n("Malagasy")) );
-//  m_langList.append( Language("mh"  , "Marshall"    , i18n("Marshall")) );
-  m_langList.append( Language("mi"  , "Maori"       , i18n("Maori")) );
-
-  m_langList.append( Language("mk"  , "Macedonian"  , i18n("Macedonian")) );
-//  m_langList.append( Language("ml"  , "Malayalam"   , i18n("Malayalam")) );
-//  m_langList.append( Language("mn"  , "Mongolian"   , i18n("Mongolian")) );
-//  m_langList.append( Language("mo"  , "Moldavian"   , i18n("Moldavian")) );
-//  m_langList.append( Language("mr"  , "Marathi"     , i18n("Marathi")) );
-  m_langList.append( Language("ms"  , "Malay"       , i18n("Malay")) );
-  m_langList.append( Language("mt"  , "Maltese"     , i18n("Maltese")) );
-//  m_langList.append( Language("my"  , "Burmese"     , i18n("Burmese")) );
-
-//  m_langList.append( Language("na"  , "Nauru"       , i18n("Nauru")) );
-//  m_langList.append( Language("nb"  , "Norwegian Bokmål"       , i18n("Norwegian Bokmål")) );
-//  m_langList.append( Language("nd"  , "Ndebele, North" , i18n("Ndebele, North")) );
-  m_langList.append( Language("nds"  , "Low German; Low Saxon" , i18n("Low German; Low Saxon")) );
-//  m_langList.append( Language("ne"  , "Nepali"      , i18n("Nepali")) );
-//  m_langList.append( Language("ng"  , "Ndonga"      , i18n("Ndonga")) );
-  m_langList.append( Language("nl"  , "Dutch"       , i18n("Dutch")) );
-//  m_langList.append( Language("nn"  , "Norwegian Nynorsk"     , i18n("Norwegian Nynorsk")) );
-  m_langList.append( Language("no"  , "Norwegian"   , i18n("Norwegian")) );
-//  m_langList.append( Language("nr"  , "Ndebele, South"     , i18n("Ndebele, South")) );
-//  m_langList.append( Language("nv"  , "Navajo"      , i18n("Navajo")) );
-//  m_langList.append( Language("ny"  , "Chichewa; Nyanja"      , i18n("Chichewa; Nyanja")) );
-
-//  m_langList.append( Language("oc"  , "Occitan (post 1500); Provençal"     , i18n("Occitan (post 1500); Provençal")) );
-//  m_langList.append( Language("om"  , "Oromo"       , i18n("Oromo")) );
-//  m_langList.append( Language("or"  , "Oriya"       , i18n("Oriya")) );
-//  m_langList.append( Language("os"  , "Ossetian; Ossetic"     , i18n("Ossetian; Ossetic")) );
-
-//  m_langList.append( Language("pa"  , "Panjabi"     , i18n("Panjabi")) );
-  m_langList.append( Language("pap"  , "Papiamento"     , i18n("Papiamento")) );
-//  m_langList.append( Language("pi"  , "Pali"        , i18n("Pali")) );
-  m_langList.append( Language("pl"  , "Polish"      , i18n("Polish")) );
-//  m_langList.append( Language("ps"  , "Pushto"      , i18n("Pushto")) );
-  m_langList.append( Language("pt"  , "Portuguese"  , i18n("Portuguese")) );
-
-//  m_langList.append( Language("qu"  , "Quechua"     , i18n("Quechua")) );
-
-//  m_langList.append( Language("rm"  , "Raeto-Romance"    , i18n("Raeto-Romance")) );
-//  m_langList.append( Language("rn"  , "Rundi"       , i18n("Rundi")) );
-
-  m_langList.append( Language("ro"  , "Romanian"    , i18n("Romanian")) );
-  m_langList.append( Language("ru"  , "Russian"     , i18n("Russian")) );
-//  m_langList.append( Language("rw"  , "Kinyarwanda" , i18n("Kinyarwanda")) );
-
-//  m_langList.append( Language("sa"  , "Sanskrit"    , i18n("Sanskrit")) );
-//  m_langList.append( Language("sc"  , "Sardinian"   , i18n("Sardinian")) );
-  m_langList.append( Language("sco"  , "Scots"   , i18n("Scots")) );
-//  m_langList.append( Language("sd"  , "Sindhi"      , i18n("Sindhi")) );
-//  m_langList.append( Language("se"  , "Northern Sami" , i18n("Northern Sami")) );
-//  m_langList.append( Language("sg"  , "Sango"       , i18n("Sango")) );
-//  m_langList.append( Language("si"  , "Sinhalese"   , i18n("Sinhalese")) );
-  m_langList.append( Language("sk"  , "Slovak"      , i18n("Slovak")) );
-  m_langList.append( Language("sl"  , "Slovenian"   , i18n("Slovenian")) );
-//  m_langList.append( Language("sm"  , "Samoan"      , i18n("Samoan")) );
-//  m_langList.append( Language("sn"  , "Shona"       , i18n("Shona")) );
-  m_langList.append( Language("so"  , "Somali"      , i18n("Somali")) );
-  m_langList.append( Language("sq"  , "Albanian"    , i18n("Albanian")) );
-//  m_langList.append( Language("sr"  , "Serbian"     , i18n("Serbian")) );
-//  m_langList.append( Language("ss"  , "Swati"       , i18n("Swati")) );
-//  m_langList.append( Language("st"  , "Sotho, Southern"     , i18n("Sotho, Southern")) );
-//  m_langList.append( Language("su"  , "Sundanese"   , i18n("Sundanese")) );
-  m_langList.append( Language("sv"  , "Swedish"     , i18n("Swedish")) );
-  m_langList.append( Language("sw"  , "Swahili"     , i18n("Swahili")) );
-  m_langList.append( Language("syr"  , "Syriac"     , i18n("Syriac")) );
-
-  m_langList.append( Language("ta"  , "Tamil"       , i18n("Tamil")) );
-//  m_langList.append( Language("te"  , "Telugu"      , i18n("Telugu")) );
-//  m_langList.append( Language("tg"  , "Tajik"       , i18n("Tajik")) );
-  m_langList.append( Language("th"  , "Thai"        , i18n("Thai")) );
-//  m_langList.append( Language("tk"  , "Turkmen"     , i18n("Turkmen")) );
-  m_langList.append( Language("tl"  , "Tagalog"     , i18n("Tagalog")) );
-  m_langList.append( Language("tn"  , "Tswana"      , i18n("Tswana")) );
-  m_langList.append( Language("tr"  , "Turkish"     , i18n("Turkish")) );
-//  m_langList.append( Language("ts"  , "Tsonga"      , i18n("Tsonga")) );
-//  m_langList.append( Language("tt"  , "Tatar"       , i18n("Tatar")) );
-//  m_langList.append( Language("tw"  , "Twi"         , i18n("Twi")) );
-  m_langList.append( Language("ty"  , "Tahitian"    , i18n("Tahitian")) );
-//
-//  m_langList.append( Language("ug"  , "Uighur"      , i18n("Uighur")) );
-  m_langList.append( Language("uk"  , "Ukrainian"   , i18n("Ukrainian")) );
-//  m_langList.append( Language("ur"  , "Urdu"        , i18n("Urdu")) );
-//  m_langList.append( Language("uz"  , "Uzbek"       , i18n("Uzbek")) );
-
-  m_langList.append( Language("vi"  , "Vietnamese"  , i18n("Vietnamese")) );
-//  m_langList.append( Language("vo"  , "Volapük"     , i18n("Volapük")) );
-//
-//  m_langList.append( Language("wo"  , "Wolof"       , i18n("Wolof")) );
-
-  m_langList.append( Language("xh"  , "Xhosa"       , i18n("Xhosa")) );
-
-  m_langList.append( Language("x-E-BAR"  , "Bavarian"     , i18n("Bavarian")) );
-  m_langList.append( Language("x-E-GSW"  , "Alemannisch"  , i18n("Alemannisch")) );
-  m_langList.append( Language("x-E-HAT"  , "Haitian Creole French" , i18n("Haitian Creole French")) );
-  m_langList.append( Language("x-E-ITZ"  , "Itzá"         , i18n("Itzá")) );  
-  m_langList.append( Language("x-E-JIV"  , "Shuar"        , i18n("Shuar")) );
-  m_langList.append( Language("x-E-KEK"  , "Kekchí"       , i18n("Kekchí")) );
-  m_langList.append( Language("x-E-LMO"  , "Lombard"      , i18n("Lombard")) );  
-  m_langList.append( Language("x-E-MKJ"  , "Macedonian"   , i18n("Macedonian")) );
-  m_langList.append( Language("x-E-PDG"  , "Tok Pisin"    , i18n("Tok Pisin")) );
-  m_langList.append( Language("x-E-PPK"  , "Uma"          , i18n("Uma")) );
-  m_langList.append( Language("x-E-RMY"  , "Romani, Vlax" , i18n("Romani, Vlax")) );
-  m_langList.append( Language("x-E-SAJ"  , "Sango"        , i18n("Sango")) );
-  m_langList.append( Language("x-E-SRN"  , "Sranan"       , i18n("Sranan")) );  
-
-//  m_langList.append( Language("yi"  , "Yiddish"     , i18n("Yiddish")) );
-//
-//  m_langList.append( Language("za"  , "Zhuang"      , i18n("Zhuang")) );
-  m_langList.append( Language("zh"  , "Chinese"     , i18n("Chinese")) );
-  m_langList.append( Language("zu"  , "Zulu"        , i18n("Zulu")) );
-
-  QValueList<Language>::iterator it;
-  for ( it = m_langList.begin(); it != m_langList.end(); ++it ) {
-    m_langMap.insert((*it).abbrev(), *it);
-  };
-};
-
-/** No descriptions */
-void CLanguageMgr::debug(){
-  //some tests
-  Language lang = languageForName("German");
-  qWarning("abbrev of language German is %s", lang.abbrev().latin1());
-
-  lang = languageForTranslatedName("Deutsch");
-  qWarning("abbrev of translated language name Deutsch is %s", lang.abbrev().latin1());
-
-  lang =  languageForAbbrev("ar");
-  qWarning("language name of abbrev ar is %s", lang.name().latin1());
-
-  lang =  languageForAbbrev("sd");
-  qWarning("language name of abbrev sd is %s and is valid? %i", lang.name().latin1(), lang.isValid());
-
-  //print out all languages
-  LangMap::Iterator it;
-  LangMap map = languages();
-  for ( it = map.begin(); it != map.end(); ++it ) {
-    qWarning("language %s: %s (%s)", it.data().abbrev().latin1(), it.data().name().latin1(),it.data().translatedName().latin1());
-  };
-}
-
-const QStringList CLanguageMgr::makeStringList( const QString& abbrevs ) {
-  return QStringList::split( ";", abbrevs, false );
-};
diff --git a/bibletime/backend/clanguagemgr.h b/bibletime/backend/clanguagemgr.h
deleted file mode 100644
index 4e070e2..0000000
--- a/bibletime/backend/clanguagemgr.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/***************************************************************************
-                          clanguagemgr.h  -  description
-                             -------------------
-    begin                : Mon Okt 21 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CLANGUAGEMGR_H
-#define CLANGUAGEMGR_H
-
-//Qt includes
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qvaluelist.h>
-#include <qpixmap.h>
-#include <qmap.h>
-
-/** Manages the anguages of BibleTime and provides functions to work with them.
-  * @author The BibleTime team
-  */
-class CLanguageMgr  {
-public:
-  class Language {
-  public:
-    /** Constructor of a language object.
-    * Uses the abbreviation parameter to lookup the language name and to be able to return the name, flag etc.
-    * Possible values for abbrev are de, en, fr, it etc.
-    */
-    Language();
-    Language(const QString& abbrev, const QString& englishName, const QString& translatedName, const QStringList altAbbrevs = QStringList());
-    ~Language();
-    const QString& abbrev() const;
-    const QString& translatedName() const;
-
-		//always define inlines in the header file, or make them not inline.
-    inline const QString& name() const{
-			return m_englishName;
-		}
-
-    const QStringList& alternativeAbbrevs() const;
-    const QPixmap flag();
-    /**
-    * Returns true if this language object is valid, i.e. has an abbrev and name.
-    */
-    const bool isValid();
-  private:
-    QString m_abbrev;
-    QString m_englishName;
-    QString m_translatedName;
-    QStringList m_altAbbrevs;
-  };
-
-  typedef QMap<QString, Language> LangMap;
-
-  CLanguageMgr();
-	virtual ~CLanguageMgr();
-  /**
-  * Returns the standard languages available as standard. Does nothing for Sword.
-  */
-  const CLanguageMgr::LangMap& languages() const;
-  /**
-  * Returns the languages which are available. The languages cover all available modules, but nothing more.
-  */
-//  const QStringList availableAbbrevs();
-  const CLanguageMgr::LangMap availableLanguages();
-  const CLanguageMgr::Language& languageForAbbrev( const QString& abbrev );
-  const CLanguageMgr::Language& languageForName( const QString& language );  
-  const CLanguageMgr::Language& languageForTranslatedName( const QString& language );
-
-  void debug();
-
-private:
-  void init();
-  const QStringList makeStringList(const QString& abbrevs);
-  LangMap m_langMap;
-};
-
-#endif
diff --git a/bibletime/backend/creferencemanager.cpp b/bibletime/backend/creferencemanager.cpp
deleted file mode 100644
index 675f9fd..0000000
--- a/bibletime/backend/creferencemanager.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/***************************************************************************
-                          creferencemanager.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 19 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "creferencemanager.h"
-#include "cswordversekey.h"
-
-#include "../frontend/cbtconfig.h"
-
-//QT includes
-#include <qregexp.h>
-
-/** Returns a hyperlink used to be imbedded in the display windows. At the moment the format is sword://module/key */
-const QString CReferenceManager::encodeHyperlink( const QString& moduleName, const QString& key, const CReferenceManager::Type& type){
-	QString ret = QString::null;
-	switch (type) {
-		case Bible:				
-			ret = QString::fromLatin1("sword://Bible/");
-			break;
-		case Commentary:
-			ret = QString::fromLatin1("sword://Commentary/");
-			break;
-		case Lexicon:
-			ret = QString::fromLatin1("sword://Lexicon/");
-			break;
-		case GenericBook:
-			ret = QString::fromLatin1("sword://Book/");
-			break;			
-		case MorphHebrew:				
-			ret = QString::fromLatin1("morph://Hebrew/");		
-			break;
-		case MorphGreek:
-			ret = QString::fromLatin1("morph://Greek/");				
-			break;
-		case StrongsHebrew:				
-			ret = QString::fromLatin1("strongs://Hebrew/");				
-			break;
-		case StrongsGreek:				
-			ret = QString::fromLatin1("strongs://Greek/");					
-			break;
-		default:
-			break;
-	}
-
-	if (!moduleName.isEmpty()) {
-		ret += moduleName + QString::fromLatin1("/");
-  }
-	else { //if module is empty use fallback module
-		ret += preferredModule(type) + QString::fromLatin1("/");
-	}	
-	
-	if (type == GenericBook) {
-		const QString s = (!key.isEmpty() ? key : QString::null);
-		QString newKey = QString::null;	
-	  //replace all / of the key (e.g. of a CSwordTreeKey) with
-	  // the escape sequence \/ so we know it's a link internal divider (e.g. of CSwordTreeKey)!
-
-    QChar c;
-		for(unsigned int i = 0; i < s.length(); ++i) {
-      c = s.at(i);
-			if (c == '/') {
-				newKey += "\\/";
-      }
-			else {
-				newKey += c;
-      }
-		}
-		ret += newKey;		
-	}
-	else { //slashes do not appear in verses and dictionary entries
-   	switch (type) {
-      case Bible: //bibles or commentary keys need parsing
-  		case Commentary: {
-        CSwordVerseKey vk(0);
-        vk = key;
-        //vk.setLocale("en");
-
-        ret += vk.key(); //we add the english key, so drag and drop will work in all cases
-        break;
-      }
-      default:
-        ret += key; //use the standard key, no parsing required
-        break;
-    }
-	}
-	return ret;
-}
-
-/** Decodes the given hyperlink to module and key. */
-const bool CReferenceManager::decodeHyperlink( const QString& hyperlink, QString& module, QString& key, CReferenceManager::Type& type ){
-	/**
-	* We have to decide between three types of URLS: sword://Type/Module/Key, morph://Testament/key and strongs://Testament/Key
-	*/	
-  module = QString::null;
-  key = QString::null;
-  	
-	type = Unknown; //not yet known
-	QString ref = hyperlink;
-	//remove the trailing slash
-	if (ref.right(1)=="/" && ref.right(2) != "\\/") //triling slash, but not escaped
-		ref = ref.left(ref.length()-1);
-	
-	//find out which type we have by looking at the beginning (protocoll section of URL)
-	if (ref.left(8) == "sword://") { //Bible, Commentary or Lexicon
-		ref = ref.mid(8);
-		if (ref.left(5) == "Bible") { //a bible hyperlink
-			type = CReferenceManager::Bible;			
-			ref = ref.mid(6); //inclusive trailing slash
-		}
-		else if (ref.left(10) == "Commentary") { // a Commentary hyperlink
-			type = CReferenceManager::Commentary;			
-			ref = ref.mid(11); //inclusive trailing slash
-		}
-		else if (ref.left(7) == "Lexicon") { // a Lexicon hyperlink
-			type = CReferenceManager::Lexicon;
-			ref = ref.mid(8); //inclusive trailing slash
-		}
-		else if (ref.left(4) == "Book") { // a Book hyperlink
-			type = CReferenceManager::GenericBook;
-			ref = ref.mid(5); //inclusive trailing slash
-		}		
-		// string up to next slash is the modulename
-		if (ref.at(0) != '/' ) { //we have a module given
-      while (true) {
-  			const int pos = ref.find("/");
-  			if (pos>0 && ref.at(pos-1) != '\\') { //found a slash which is not escaped
-  				module = ref.mid(0,pos);
-  				ref = ref.mid(pos+1);
-  				break;
-  			}
-        else if (pos == -1) {
-          break;
-        }
-  		}
-  		// the rest is the key
-   		key = ref;
-    }
-    else {
-      key = ref.mid(1);
-    }
- 		//replace \/ escapes with /
- 		key.replace(QRegExp("\\\\/"), "/");
-	}
-	else if (ref.left(8) == "morph://" || ref.left(10) == "strongs://") { //strongs or morph URL have the same format
-		enum PreType {IsMorph, IsStrongs};
-		PreType preType = IsMorph;
-		if (ref.left(8) == "morph://") { //morph code hyperlink
-			ref = ref.mid(8);
-			preType = IsMorph;
-		}
-		else if (ref.left(10) == "strongs://") {
-			ref = ref.mid(10);		
-			preType = IsStrongs;			
-		}
-		//part up to next slash is the language
-		const int pos = ref.find("/");
-		if (pos>0) { //found
-			const QString language = ref.mid(0,pos);
-			if (language == "Hebrew") {
-				switch (preType) {
-					case IsMorph:
-						type = CReferenceManager::MorphHebrew;
-						break;
-					case IsStrongs:
-						type = CReferenceManager::StrongsHebrew;
-						break;								
-				}			
-			}
-			else if (language == "Greek") {
-				switch (preType) {
-					case IsMorph:
-						type = CReferenceManager::MorphGreek;
-						break;
-					case IsStrongs:
-						type = CReferenceManager::StrongsGreek;
-						break;								
-				}
-			}
-			ref = ref.mid(pos+1);
-			key = ref; //the remaining part is the key
-			
-			module = preferredModule(type);
-		}
-	}
-
-  if (key.isEmpty() && module.isEmpty())
-  	return false;
-	return true;
-}
-
-const QString CReferenceManager::encodeReference(const QString &module, const QString &reference){
-	return QString::fromLatin1("(%1)%2").arg(module).arg(reference);
-}
-
-void CReferenceManager::decodeReference(QString &dragreference, QString &module, QString &reference){
-  const int pos = dragreference.find(")");
-	const QString fallbackModule = dragreference.mid( 1, pos - 1);
-  dragreference = dragreference.mid(pos+1);
-
-  module = fallbackModule;
-  reference = dragreference;
-}
-
-/** Returns true if the parameter is a hyperlink. */
-const bool CReferenceManager::isHyperlink( const QString& hyperlink ){
-	return (    hyperlink.left(8)  == "sword://")
-					|| (hyperlink.left(10) == "strongs://")
-					|| (hyperlink.left(8)  == "morph://");
-}
-
-/** Returns the preferred module name for the given type. */
-const QString CReferenceManager::preferredModule( const CReferenceManager::Type type ){
-	QString description = QString::null;
-	switch (type) {
-		case CReferenceManager::Bible:
-			description = CBTConfig::get( CBTConfig::standardBible );
-			break;
-		case CReferenceManager::Commentary:
-			description = CBTConfig::get( CBTConfig::standardCommentary );
-			break;			
-		case CReferenceManager::Lexicon:
-			description = CBTConfig::get( CBTConfig::standardLexicon );
-			break;			
-		case CReferenceManager::StrongsHebrew:
-			description = CBTConfig::get( CBTConfig::standardHebrewStrongsLexicon );
-			break;			
-		case CReferenceManager::StrongsGreek:
-			description = CBTConfig::get( CBTConfig::standardGreekStrongsLexicon );
-			break;			
-		case CReferenceManager::MorphHebrew:
-			description = CBTConfig::get( CBTConfig::standardHebrewMorphLexicon );
-			break;			
-		case CReferenceManager::MorphGreek:
-			description = CBTConfig::get( CBTConfig::standardGreekMorphLexicon );
-			break;			
-		default:
-//			qWarning("unknwon type");
-			description = QString::null;
-			break;			
-	}
-	if (!description.isEmpty())
-		return CSwordBackend::findModuleNameByDescription(description);
-	else
-		return QString::null;
-}
-
-/** No descriptions */
-CReferenceManager::Type CReferenceManager::typeFromModule( const CSwordModuleInfo::ModuleType type){
-	switch (type) {
-		case CSwordModuleInfo::Bible:
-			return CReferenceManager::Bible;
-		case CSwordModuleInfo::Commentary:
-			return CReferenceManager::Commentary;
-		case CSwordModuleInfo::Lexicon:
-			return CReferenceManager::Lexicon;
-    case CSwordModuleInfo::GenericBook:
-      return CReferenceManager::GenericBook;
-		default:
-			return CReferenceManager::Unknown;
-	}
-}
-
-/** Parses the given verse references using the given language and the module.*/
-const QString CReferenceManager::parseVerseReference( const QString ref, const QString& lang, const QString& newLang){
-	CSwordVerseKey key(0);
-	if (!lang.isEmpty()) {
-		key.setLocale( lang.latin1() );
-  }
-	
-	key.key(ref);
-	
-	if (!lang.isEmpty() && lang != newLang) {
-		key.setLocale(newLang.latin1());
-  }
-	return key.key();
-}
diff --git a/bibletime/backend/creferencemanager.h b/bibletime/backend/creferencemanager.h
deleted file mode 100644
index 661d955..0000000
--- a/bibletime/backend/creferencemanager.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/***************************************************************************
-                          creferencemanager.h  -  description
-                             -------------------
-    begin                : Sun Aug 19 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CREFERENCEMANAGER_H
-#define CREFERENCEMANAGER_H
-
-//Qt includes
-#include <qstring.h>
-
-#include "cswordmoduleinfo.h"
-
-/**Contains static functions to compute with referneces used for Drag&Drop and for hyperlinks used in HTML.
-  *@author The BibleTime team
-  */
-class CReferenceManager {
-public:
-	enum Type {
-		Bible,
-		Commentary,
-		Lexicon,
-		GenericBook,
-		MorphHebrew,
-		MorphGreek,
-		StrongsHebrew,
-		StrongsGreek,
-		Unknown
-	};
-  /**
-	* Decodes the given hyperlink to module and key.
-	*/
-  static const bool decodeHyperlink( const QString& hyperlink, QString& module, QString& key,Type& type);
-  /**
-	* Returns a hyperlink used to be imbedded in the display windows.
-	* At the moment the format is sword://module/key
- 	*/
-  static const QString encodeHyperlink( const QString& module, const QString& key, const Type& type);
-  /**
-	* Puts a module Name and a Reference together in the 'draggable' form
-	* (module)reference
-	* @param module The name of the module
-	* @param reference The key reference as text
-	* @return The encoded reference using module and reference
-	* @author Martin Gruner
-	*/
-	static const QString encodeReference(const QString &module, const QString &reference);
-	/**
-	* decodes a 'draggable' reference into a modulename and a reference
-	* @author Martin Gruner
-	*/
-	static void decodeReference(QString &dragreference, QString &module, QString &reference);
-  /**
-  * Returns true if the parameter is a hyperlink.
-  */
-  static const bool isHyperlink( const QString& hyperlink );
-  /**
-  * Returns the preferred module name for the given type.
-  */
-  static const QString preferredModule( const Type type );
-  static CReferenceManager::Type typeFromModule( const CSwordModuleInfo::ModuleType type );
-  /** Parses the given verse references using the given language and the module.
-	* @param ref The verse refernce
-	* @param lang The language of the verse reference
-	* @param newLang The language of the reference, which will be returned. For example: If BibleTime using an english environment parses a spanish ref (lang=es) the returned ref should be in english (newLang=en), because his english standard module only understands en.
-	*/
-  static const QString parseVerseReference( const QString ref, const QString& lang = QString::null, const QString& newLang = "en");
-};
-
-#endif
-
diff --git a/bibletime/backend/cswordbackend.cpp b/bibletime/backend/cswordbackend.cpp
deleted file mode 100644
index f355006..0000000
--- a/bibletime/backend/cswordbackend.cpp
+++ /dev/null
@@ -1,548 +0,0 @@
-/***************************************************************************
-                          cswordbackend.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordbackend.h"
-#include "centrydisplay.h"
-#include "cswordbiblemoduleinfo.h"
-#include "cswordcommentarymoduleinfo.h"
-#include "cswordlexiconmoduleinfo.h"
-#include "cswordbookmoduleinfo.h"
-#include "frontend/cbtconfig.h"
-
-#include "bt_thmlhtml.h"
-#include "bt_osishtml.h"
-#include "bt_gbfhtml.h"
-#include <dirent.h>
-#include <unistd.h>
-
-//Qt includes
-#include <qdir.h>
-#include <qfileinfo.h>
-
-//KDE includes
-#include <klocale.h>
-
-//Sword includes
-#include <swdisp.h>
-#include <swfiltermgr.h>
-#include <encfiltmgr.h>
-#include <plainhtml.h>
-#include <rawgbf.h>
-#include <rtfhtml.h>
-#include <filemgr.h>
-#include <utilstr.h>
-
-using std::string;
-
-//static class-wide members
-static QMap<QString, QString> moduleDescriptionMap;
-
-CSwordBackend::CSwordBackend()
-	: sword::SWMgr(0, 0, false, new sword::EncodingFilterMgr( sword::ENC_UTF8 ))
-{	
-	m_displays.entry = 0;
-	m_displays.chapter = 0;
-	m_displays.book = 0;
-
-	m_filters.gbf = 0;
-	m_filters.thml = 0;
-	m_filters.osis = 0;
-	m_filters.plain = 0;
-}
-
-CSwordBackend::CSwordBackend(const QString& path)
-	: sword::SWMgr((!path.isEmpty() ? path.local8Bit() : 0), false, new sword::EncodingFilterMgr( sword::ENC_UTF8 ))
-{
-  qWarning("backend constructed with a path argument! %s", path.latin1());
-	m_displays.entry = 0;
-	m_displays.chapter = 0;
-	m_displays.book = 0;
-
-	m_filters.gbf = 0;
-	m_filters.thml = 0;
-	m_filters.osis = 0;
-	m_filters.plain = 0;
-}
-
-CSwordBackend::~CSwordBackend(){
-	shutdownModules();
-	delete m_filters.gbf;
-	delete m_filters.plain;
-	delete m_filters.thml;
-	delete m_filters.osis;
-
-  delete m_displays.book;
-  delete m_displays.chapter;
-  delete m_displays.entry;
-}
-
-/** Initializes the Sword modules. */
-const CSwordBackend::LoadError CSwordBackend::initModules() {
-//  qWarning("globalSwordConfigPath is %s", globalConfPath);
-	LoadError ret = NoError;
-
- 	shutdownModules(); //remove previous modules
- 	m_moduleList.clear();	
-
-	ret = LoadError( Load() );
-	for (sword::ModMap::iterator it = Modules.begin(); it != Modules.end(); it++) {
-		sword::SWModule* const curMod = (*it).second;
-		CSwordModuleInfo* newModule = 0;
-				
-		if (!strcmp(curMod->Type(), "Biblical Texts")) {
-			newModule = new CSwordBibleModuleInfo(curMod, this);
-			newModule->module()->Disp(m_displays.chapter ? m_displays.chapter : (m_displays.chapter = new CChapterDisplay));
-		} else if (!strcmp(curMod->Type(), "Commentaries")) {
-			newModule = new CSwordCommentaryModuleInfo(curMod, this);
-			newModule->module()->Disp(m_displays.entry ? m_displays.entry : (m_displays.entry = new CEntryDisplay));
-		} else if (!strcmp(curMod->Type(), "Lexicons / Dictionaries")) {
-			newModule = new CSwordLexiconModuleInfo(curMod, this);
-			newModule->module()->Disp(m_displays.entry ? m_displays.entry : (m_displays.entry = new CEntryDisplay));
-		} else if (!strcmp(curMod->Type(), "Generic Books")) {
-			newModule = new CSwordBookModuleInfo(curMod, this);
-			newModule->module()->Disp(m_displays.book ? m_displays.book : (m_displays.book = new CBookDisplay));
-		}
-		
-		if (newModule) {	//append the new modules to our list
-			m_moduleList.append( newModule );
-		}
-	}
-
-	for (m_moduleList.first(); m_moduleList.current(); m_moduleList.next()) {
-		moduleDescriptionMap.insert(m_moduleList.current()->config(CSwordModuleInfo::Description), m_moduleList.current()->name());
-	}
-
-	//unlock modules if keys are present
-	for (m_moduleList.first(); m_moduleList.current(); m_moduleList.next()) {
-		if ( m_moduleList.current()->isEncrypted() ){
-			const QString unlockKey = CBTConfig::getModuleEncryptionKey(m_moduleList.current()->name()).latin1();
-			if (!unlockKey.isNull()){
-  			setCipherKey( m_moduleList.current()->name().latin1(), unlockKey.latin1() );
-			}
-		}
-	}
-
-	return ret;
-}
-
-void CSwordBackend::AddRenderFilters(sword::SWModule *module, sword::ConfigEntMap &section) {
-	sword::SWBuf sourceformat;
-	sword::SWBuf moduleDriver;
-	sword::ConfigEntMap::iterator entry;
-	bool noDriver = true;
-
-	sourceformat = ((entry = section.find("SourceType")) != section.end()) ? (*entry).second : (sword::SWBuf) "";
-	moduleDriver = ((entry = section.find("ModDrv")) != section.end()) ? (*entry).second : (sword::SWBuf) "";
-
-	if (sourceformat == "GBF") {
-		if (!m_filters.gbf)
-			m_filters.gbf = new BT_GBFHTML();
-		module->AddRenderFilter(m_filters.gbf);
-		noDriver = false;
-	}
-
-	if (sourceformat == "PLAIN") {
-		if (!m_filters.plain)
-			m_filters.plain = new sword::PLAINHTML();	
-		module->AddRenderFilter(m_filters.plain);
-		noDriver = false;
-	}
-
-	if (sourceformat == "ThML") {
-		if (!m_filters.thml)
-			m_filters.thml = new BT_ThMLHTML();
-		module->AddRenderFilter(m_filters.thml);
-		noDriver = false;
-	}
-
-	if (sourceformat == "OSIS") {
-		if (!m_filters.osis)
-			m_filters.osis = new BT_OSISHTML();
-		module->AddRenderFilter(m_filters.osis);
-		noDriver = false;
-	}
-
-	if (noDriver){ //no driver found
-		if ( (moduleDriver == "RawCom") || (moduleDriver == "RawLD") ) {
-			if (!m_filters.plain)
-				m_filters.plain = new sword::PLAINHTML();
-			module->AddRenderFilter(m_filters.plain);
-			noDriver = false;
-		}
-	}
-}
-
-/** This function deinitializes the modules and deletes them. */
-const bool CSwordBackend::shutdownModules(){
-	for (m_moduleList.first(); m_moduleList.current(); m_moduleList.next()) {
-		CSwordModuleInfo* current = m_moduleList.current();
-    m_moduleList.removeRef(current);
-		delete current;
-	}
-	m_moduleList.clear();
-
-  //BT  mods are deleted now, delete Sword mods, too.
-  DeleteMods();
-  
-	return true;
-}
-
-/** Returns true if the given option is enabled. */
-const bool CSwordBackend::isOptionEnabled( const CSwordBackend::FilterTypes type) {
-	return (getGlobalOption( optionName(type).latin1() ) == "On");
-}
-
-/** Sets the given options enabled or disabled depending on the second parameter. */
-void CSwordBackend::setOption( const CSwordBackend::FilterTypes type, const int state ){
-  sword::SWBuf value;
-	switch (type) {
-		case textualVariants:
-      if (state == 0) {
-        value = "Primary Reading";
-			}
-      else if (state == 1) {
-        value = "Secondary Reading";
-			}
-      else {
-        value = "All Readings";
-			}
-			break;
-
-		case transliteration:
-      if (useICU()) {
-        sword::StringList options = transliterator()->getOptionValues();
-        sword::StringList::iterator it = options.begin();
-        for (int index = state; (index > 0) && (it != options.end()); ++it) {
-          --index;
-        }
-        value = it->c_str();
-				qWarning("setting transliteration to %s", value.c_str());
-      }
-      break;
-
-		default:
-			value = state ? "On": "Off";
-			break;
-	};
-	if (value.length())
-    setGlobalOption(optionName(type).latin1(), value.c_str());
-}
-
-void CSwordBackend::setFilterOptions( const CSwordBackend::FilterOptions options){
-//  qWarning("CSwordBackend::setFilterOptions( const CSwordBackend::FilterOptions options)");
-  setOption( footnotes, 					options.footnotes );
-  setOption( strongNumbers, 			options.strongNumbers );
-  setOption( headings, 						options.headings );
-  setOption( morphTags, 					options.morphTags );
-	setOption( lemmas, 							options.lemmas );
-	setOption( hebrewPoints, 				options.hebrewPoints );
-	setOption( hebrewCantillation, 	options.hebrewCantillation );
-	setOption( greekAccents, 				options.greekAccents );
-	setOption( redLetterWords,			options.redLetterWords );	
-  setOption( textualVariants,			options.textualVariants );	
-	setOption( transliteration,			options.transliteration );	
-	setOption( scriptureReferences,	options.scriptureReferences);	
-}
-
-void CSwordBackend::setDisplayOptions( const CSwordBackend::DisplayOptions options){
-  if (m_displays.entry)
-		m_displays.entry->setDisplayOptions(options);	
-  if (m_displays.chapter)
-		m_displays.chapter->setDisplayOptions(options);	
-  if (m_displays.book)
-		m_displays.book->setDisplayOptions(options);
-}
-
-/** This function searches for a module with the specified description */
-CSwordModuleInfo* const CSwordBackend::findModuleByDescription(const QString& description){
-  if (m_moduleList.count())
-    for ( m_moduleList.first();m_moduleList.current();m_moduleList.next() )
-      if ( m_moduleList.current()->config(CSwordModuleInfo::Description) == description )
-        return m_moduleList.current();
-  return 0;
-}
-
-/** This function searches for a module with the specified description */
-const QString CSwordBackend::findModuleNameByDescription(const QString& description){
-	if (moduleDescriptionMap.contains(description)) {
-		return moduleDescriptionMap[description];
-  }
-  return QString::null;
-}
-
-/** This function searches for a module with the specified name */
-CSwordModuleInfo* const CSwordBackend::findModuleByName(const QString& name){
-  if (m_moduleList.count()) {
-    for ( m_moduleList.first(); m_moduleList.current(); m_moduleList.next() ) {
-      if ( m_moduleList.current()->name() == name ) {
-        return m_moduleList.current();
-      }
-    }
-  }
-  return 0;
-}
-
-CSwordModuleInfo* const CSwordBackend::findSwordModuleByPointer(const sword::SWModule* const swmodule){
-  if (swmodule) {
-    for ( m_moduleList.first(); m_moduleList.current(); m_moduleList.next() ) {
-      if ( m_moduleList.current()->module() == swmodule ) {
-        return m_moduleList.current();
-      }
-    }
-  }
-  return 0;
-}
-
-CSwordModuleInfo* const CSwordBackend::findModuleByPointer(const CSwordModuleInfo* const module){
-  if (module) {
-    for ( m_moduleList.first(); m_moduleList.current(); m_moduleList.next() ) {
-      if ( m_moduleList.current() == module ) {
-        return m_moduleList.current();
-      }
-    }
-  }
-  return 0;
-}
-
-/** Returns our local config object to store the cipher keys etc. locally for each user. The values of the config are merged with the global config. */
-const bool CSwordBackend::moduleConfig(const QString& module, sword::SWConfig& moduleConfig) {
-	sword::SectionMap::iterator section;
-	DIR *dir = opendir(configPath);
-	struct dirent *ent;
-	
-	bool foundConfig = false;	
-	QString modFile;	
-	if (dir) {    // find and update .conf file
-		rewinddir(dir);
-		while ((ent = readdir(dir)) && !foundConfig) {
-			if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {								
-				modFile = QString::fromLocal8Bit(configPath);
-				modFile += QString::fromLatin1("/");
-				modFile += QString::fromLocal8Bit(ent->d_name);
-				moduleConfig = sword::SWConfig( (const char*)modFile.local8Bit() );
-				section =	moduleConfig.Sections.find( (const char*)module.local8Bit() );
-				foundConfig = ( section != moduleConfig.Sections.end() );
-			}
-		}
-		closedir(dir);
-	}
-	else { //try to read mods.conf
-		//moduleConfig = SWConfig( configPath + "/mods.conf" );
-		moduleConfig = sword::SWConfig("");//global config		
-		section =	config->Sections.find( (const char*)module.local8Bit() );		
-		foundConfig = ( section != config->Sections.end() );		
-		
-		sword::ConfigEntMap::iterator entry;
-		if (foundConfig) { //copy module section
-			for (entry = (*section).second.begin(); entry != (*section).second.end(); entry++) {
-					moduleConfig.Sections[(*section).first].insert(sword::ConfigEntMap::value_type((*entry).first, (*entry).second));
-			}
-		}			
-	}
-	
-	if (!foundConfig && configType != 2) { //search in $HOME/.sword/
-		QString myPath = QString::fromLatin1("%1/.sword/mods.d").arg(getenv("HOME"));
-		dir = opendir(myPath.latin1());
-		if (dir) {
-			rewinddir(dir);
-			while ((ent = readdir(dir)) && !foundConfig) {
-				if ((strcmp(ent->d_name, ".")) && (strcmp(ent->d_name, ".."))) {								
-					modFile = myPath;
-					modFile += "/";
-					modFile += ent->d_name;
-					moduleConfig = sword::SWConfig( (const char*)modFile.local8Bit() );
-					section =	moduleConfig.Sections.find( (const char*)module.local8Bit() );
-					foundConfig = ( section != moduleConfig.Sections.end() );
-				}
-			}
-			closedir(dir);
-		}
-	}
-	return foundConfig;
-}
-
-/** Returns the text used for the option given as parameter. */
-const QString CSwordBackend::optionName( const CSwordBackend::FilterTypes option ){
-	switch (option) {
-		case CSwordBackend::footnotes:
-			return QString::fromLatin1("Footnotes");
-		case CSwordBackend::strongNumbers:
-			return QString::fromLatin1("Strong's Numbers");
-		case CSwordBackend::headings:
-			return QString::fromLatin1("Headings");
-		case CSwordBackend::morphTags:
-			return QString::fromLatin1("Morphological Tags");
-  	case CSwordBackend::lemmas:
-			return QString::fromLatin1("Lemmas");
-		case CSwordBackend::hebrewPoints:
-			return QString::fromLatin1("Hebrew Vowel Points");
-		case CSwordBackend::hebrewCantillation:
-			return QString::fromLatin1("Hebrew Cantillation");
-		case CSwordBackend::greekAccents:
-			return QString::fromLatin1("Greek Accents");
-		case CSwordBackend::redLetterWords:
-			return QString::fromLatin1("Words of Christ in Red");
-    case CSwordBackend::textualVariants:
-			return QString::fromLatin1("Textual Variants");	
-		case CSwordBackend::scriptureReferences:
-			return QString::fromLatin1("Cross-references");
-		case CSwordBackend::transliteration:
-			return QString::fromLatin1("Transliteration");
-	}
-	return QString::null;	
-}
-
-/** Returns the translated name of the option given as parameter. */
-const QString CSwordBackend::translatedOptionName(const CSwordBackend::FilterTypes option){
-	switch (option) {
-		case CSwordBackend::footnotes:
-			return i18n("Footnotes");
-		case CSwordBackend::strongNumbers:
-			return i18n("Strong's Numbers");
-		case CSwordBackend::headings:
-			return i18n("Headings");
-		case CSwordBackend::morphTags:
-			return i18n("Morphological Tags");
-  	case CSwordBackend::lemmas:
-			return i18n("Lemmas");
-		case CSwordBackend::hebrewPoints:
-			return i18n("Hebrew Vowel Points");
-		case CSwordBackend::hebrewCantillation:
-			return i18n("Hebrew Cantillation");
-		case CSwordBackend::greekAccents:
-			return i18n("Greek Accents");
-		case CSwordBackend::redLetterWords:
-			return i18n("Red letter words");
-		case CSwordBackend::textualVariants:
-			return i18n("Textual Variants");
-		case CSwordBackend::scriptureReferences:
-			return i18n("Scripture Cross-references");	
-		case CSwordBackend::transliteration:
-			return i18n("Transliteration between scripts");	
-	}
-	return QString::null;
-}
-
-
-const QString CSwordBackend::configOptionName( const CSwordBackend::FilterTypes option ){
-	switch (option) {
-		case CSwordBackend::footnotes:
-			return QString::fromLatin1("Footnotes");         
-		case CSwordBackend::strongNumbers:
-			return QString::fromLatin1("Strongs");
-		case CSwordBackend::headings:
-			return QString::fromLatin1("Headings");
-		case CSwordBackend::morphTags:
-			return QString::fromLatin1("Morph");
-  	case CSwordBackend::lemmas:
-			return QString::fromLatin1("Lemma");
-		case CSwordBackend::hebrewPoints:
-			return QString::fromLatin1("HebrewPoints");
-		case CSwordBackend::hebrewCantillation:
-			return QString::fromLatin1("Cantillation");
-		case CSwordBackend::greekAccents:
-			return QString::fromLatin1("GreekAccents");
-		case CSwordBackend::redLetterWords:
-			return QString::fromLatin1("RedLetterWords");
-		case CSwordBackend::textualVariants:
-			return QString::fromLatin1("Variants");
-		case CSwordBackend::scriptureReferences:
-			return QString::fromLatin1("Scripref");
-    default:
-      return QString::null;
-	}
-	return QString::null;	
-}
-
-const QString CSwordBackend::booknameLanguage( const QString& language ) {
-	if (!language.isNull())
-		sword::LocaleMgr::systemLocaleMgr.setDefaultLocaleName( language.local8Bit() );
-	return QString::fromLatin1(sword::LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
-}
-
-/** Returns the version of the Sword library. */
-const sword::SWVersion CSwordBackend::Version() {
-	return sword::SWVersion::currentVersion;
-}
-
-/** Returns our transliterator object we use. Returns 0 if ICU is not used. */
-sword::SWFilter* const CSwordBackend::transliterator() {
-  if (!useICU())
-    return 0;
-  if (sword::SWFilter* filter = optionFilters["UTF8Transliterator"])
-    return filter;
-  return 0;
-}
-
-/** Returns true if ICU is being used. */
-const bool CSwordBackend::useICU() const{
-  return SWMgr::isICU;
-}
-
-/** Reload all Sword modules. */
-void CSwordBackend::reloadModules(){
-  shutdownModules();
-  
-  //delete Sword's config to make Sword reload it!
-  if (myconfig) { // force reload on config object because we may have changed the paths
-    delete myconfig;
-    config = myconfig = 0;
-    loadConfigDir(configPath);
-  }
-  else if (config) {
-    config->Load();
-  }
-  initModules();
-}
-
-const QStringList CSwordBackend::swordDirList(){
-  QStringList ret;
-	const QString home = getenv("HOME");
-
-  //return a list of used Sword dirs. Useful for the installer
-  QString configPath;
-	if (!home.isEmpty())
-		configPath = home + "/.sword/sword.conf";
-	else
-		configPath = globalConfPath; //e.g. /etc/sword.conf, /usr/local/etc/sword.conf
-
-
-  QStringList configs = QStringList::split(":", configPath);
-  for (QStringList::iterator it = configs.begin(); it != configs.end(); ++it) {
-    if (!QFileInfo(*it).exists())
-      continue;
-
-    //get all DataPath and AugmentPath entries from the config file and add them to the list
-    sword::SWConfig conf( (*it).latin1() );
-
-    ret << conf["Install"]["DataPath"].c_str();
-    sword::ConfigEntMap group = conf["Install"];
-    sword::ConfigEntMap::iterator start = group.equal_range("AugmentPath").first;
-    sword::ConfigEntMap::iterator end = group.equal_range("AugmentPath").second;
-
-    for (sword::ConfigEntMap::iterator it = start; it != end; ++it) {
-      ret << it->second.c_str(); //added augment path
-    }
-  }
-
-  if (!home.isEmpty()) {
-    ret << home + "/.sword/";
-  }
-
-  return ret;
-}
diff --git a/bibletime/backend/cswordbackend.h b/bibletime/backend/cswordbackend.h
deleted file mode 100644
index 83bfd0a..0000000
--- a/bibletime/backend/cswordbackend.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/***************************************************************************
-                          cswordbackend.h  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDBACKEND_H
-#define CSWORDBACKEND_H
-
-//BibleTime includes
-//#include "cswordmoduleinfo.h"
-
-//Qt includes
-#include <qptrlist.h>
-#include <qmap.h>
-#include <qstring.h>
-#include <qstringlist.h>
-
-//Sword includes
-#include <swmgr.h>
-#include <swmodule.h>
-#include <swversion.h>
-#include <localemgr.h>
-
-class CEntryDisplay;
-class CChapterDisplay;
-class CBookDisplay;
-
-class CSwordModuleInfo;
-typedef QPtrList<CSwordModuleInfo>	ListCSwordModuleInfo;
-
-/**
-	* This is the implementation of CBackend for Sword. It's additionally derived from SWMgr
-	*	to provide functions of Sword.	
-  *
-  *	@short The backend implementation of Sword
-  *	@author The BibleTime team
-  * @version $Id: cswordbackend.h,v 1.37 2003/10/02 20:37:41 joachim Exp $
-  */
-class CSwordBackend : public sword::SWMgr {
-public:
-  /**
- 	* These are the options which could be supported by modules and by this backend.
- 	* It's used in @ref isOptionEnabled and @ref setOption
- 	*/
-  enum FilterTypes {
-  	footnotes,
-  	strongNumbers,
-  	headings,
-  	morphTags,
-		lemmas,
-		hebrewPoints,
-		hebrewCantillation,
-		greekAccents,
-    scriptureReferences,
-    redLetterWords,
-    textualVariants,
-		filterTypesMIN = footnotes,
-		filterTypesMAX = textualVariants,
-
-    /* The following are handled in a special way */
-    transliteration
-	};
-
-  struct FilterOptions {
-  	int footnotes;
-  	int strongNumbers;
-  	int headings;
-  	int morphTags;
-		int lemmas;
-		int hebrewPoints;
-		int hebrewCantillation;
-		int greekAccents;
-		int textualVariants;
-    int redLetterWords;
-    int scriptureReferences;
-    int transliteration;
-	};
-	struct DisplayOptions {
-		int lineBreaks;
-		int verseNumbers;
-	};
-  enum LoadError { // the values exist to cast from the char return of SWMgr::Load
-		NoSwordConfig = -1,
-		NoError = 0,
-		NoModules = 1
-  };
-	/**
-	* The constructor of the Sword backend.
-	* It creates the SWModule objects using SWMgr's methods, it adds the necessary
-	* filters for the module format.
-	*/
-	CSwordBackend();
-	CSwordBackend( const QString& path );
-  
-	/**
-	* The destrctor of this backend. This function shuts the modules down using @ref shutdownModules.
-	*/
-	virtual ~CSwordBackend();
-  /**
-  * This function returns the list of available modules managed by this backend.
-  *	You have to call initModules() first;
-  *	
-  *	@return The list of modules managed by this backend
-  */
-  virtual ListCSwordModuleInfo& moduleList();
-  /**
-  * Initializes the Sword modules.
-  *
-  *	@return True if the initializiation was succesful, otherwise return false.
-  */
-  virtual const CSwordBackend::LoadError initModules();
-  /**
-  * This function deinitializes the modules and deletes them.
-  *
-  *	@return True if it was succesful, otherwise return false
-  */
-  virtual const bool shutdownModules();
-  /**
-  * Sets the given options enabled or disabled depending on the second parameter.
-  *
-  * @param type This is the type this function should set enabled or disabled
-  * @param enable If this is true the option will be enabled, otherwise it will be disabled.
-  */
-  void setOption( const CSwordBackend::FilterTypes type, const int state );
-  void setFilterOptions( const CSwordBackend::FilterOptions options );
-  void setDisplayOptions( const CSwordBackend::DisplayOptions options );
-  /**
-  * Returns true if the given option is enabled.
-  *
-  * @return Returns true if the options given as aparameter is switched on at this time, otherwise return false.
-  */
-  virtual const bool isOptionEnabled( const CSwordBackend::FilterTypes type);
-  /**
-  * Sets the language for the international booknames of Sword.
-  */
-  const QString booknameLanguage( const QString& = QString::null );
-  /**
-  * This function searches for a module with the specified description
-  * @param description The description of the desired module
-  * @return pointer to the desired module; null if no module has the specified description
-  */
-  virtual CSwordModuleInfo* const findModuleByDescription(const QString& description);
-  /**
-  * This function searches for a module with the specified description
-  * @param description The description of the desired module
-  * @return pointer to the desired module; null if no module has the specified description
-  */
-  static const QString findModuleNameByDescription(const QString& description);
-  /**
-  * This function searches for a module with the specified name
-  * @param description The name of the desired module
-  * @return pointer to the desired module; null if no module has the specified name
-  */
-  CSwordModuleInfo* const findModuleByName(const QString& name);
-  /**
-  * This function searches for a module with the specified sword module as module() object!
-  * @param pointer to a Sword module
-  * @return pointer to the desired module; null if no module has the specified name
-  */
-  CSwordModuleInfo* const findSwordModuleByPointer(const sword::SWModule* const swmodule);
-  CSwordModuleInfo* const findModuleByPointer(const CSwordModuleInfo* const module);
-  /**
-  * @return Our global config object to store the cipher keys etc.
-	*/
-  sword::SWConfig* const getConfig() const;
-  /**
-  * Tries to find the config object for the module. The second paramter will be the found config.
-  * @return True if the config was found, false if not. If false is returned the moduleConfig object is in undefined/unknwon state.
-	*/
-  const bool moduleConfig(const QString& module, sword::SWConfig& moduleConfig);
-  /**
-  * Returns the text used for the option given as parameter.
-  */
-  static const QString optionName( const CSwordBackend::FilterTypes option);
-  /**
-  * Returns the text used for the option given as parameter.
-  */
-  static const QString configOptionName( const CSwordBackend::FilterTypes option);
-  /**
-	* Returns the translated name of the option given as parameter.
-	*/
-  static const QString translatedOptionName(const CSwordBackend::FilterTypes option);
-  /**
-  * Returns the version of the Sword library.
-  */
-  virtual const sword::SWVersion Version();
-  /**
-  * Returns our transliterator object we use. Returns 0 if ICU is not used.
-  */
-  sword::SWFilter* const transliterator();
-  /** Returns true if ICU is being used. */
-  const bool useICU() const;
-  /**
-  * Reload all Sword modules.
-  */
-  void reloadModules();
-
-  /**
-  * Reload all Sword modules.
-  */
-  const QStringList swordDirList();
-	
-protected:
-	/**
-	* Adds a render filter to the module.
-	* @param module Add a render filter to this module!
-	*/
-	virtual void AddRenderFilters(sword::SWModule *module, sword::ConfigEntMap &section);
-	
-private:
-	//filters
-	struct {
-		sword::SWFilter *gbf;
-		sword::SWFilter *plain;
-		sword::SWFilter *thml;
- 		sword::SWFilter *osis;
-	} m_filters;
-	ListCSwordModuleInfo m_moduleList;
-
-	struct {
-		CChapterDisplay* 	chapter;
-		CEntryDisplay* 		entry;
-		CBookDisplay* 		book;
-	} m_displays;
-};
-
-/**Returns The list of modules managed by this backend*/
-inline ListCSwordModuleInfo& CSwordBackend::moduleList() {
-	return m_moduleList;
-}
-
-/** Returns our local config object to store the cipher keys etc. locally for each user. The values of the config are merged with the global config. */
-inline sword::SWConfig* const CSwordBackend::getConfig() const {
-	return config;
-}
-
-#endif
diff --git a/bibletime/backend/cswordbiblemoduleinfo.cpp b/bibletime/backend/cswordbiblemoduleinfo.cpp
deleted file mode 100644
index 7172d1f..0000000
--- a/bibletime/backend/cswordbiblemoduleinfo.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-/***************************************************************************
-                          cswordbiblemoduleinfo.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordbiblemoduleinfo.h"
-#include "cswordversekey.h"
-
-//Qt includes
-#include <qfile.h>
-
-//Sword includes
-#include <versekey.h>
-
-static sword::VerseKey staticKey;
-
-CSwordBibleModuleInfo::CSwordBibleModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend )
-	: CSwordModuleInfo(module, usedBackend),
-    m_lowerBound(0),
-    m_upperBound(0),
-	  m_bookList(0),
-	  m_cachedLocale("unknown"),
-	  m_hasOT(-1),
-    m_hasNT(-1)
-{
-
-
-}
-
-CSwordBibleModuleInfo::CSwordBibleModuleInfo( const CSwordBibleModuleInfo& m ) :
-  CSwordModuleInfo(m),
-  m_lowerBound(0),
-  m_upperBound(0),
-  m_bookList(0)
-{
-	if (m.m_bookList) {
-		m_bookList = new QStringList();
-		*m_bookList = *m.m_bookList;
-	}	
-	m_hasOT = m.m_hasOT;
-	m_hasNT = m.m_hasNT;
-	m_cachedLocale = m.m_cachedLocale;
-}
-
-CSwordModuleInfo* CSwordBibleModuleInfo::clone(){
-	return new CSwordBibleModuleInfo(*this);
-}
-
-CSwordBibleModuleInfo::~CSwordBibleModuleInfo(){
-	delete m_bookList;
-}
-
-void CSwordBibleModuleInfo::initBounds() {
-	if (m_hasOT == -1)
-		m_hasOT = hasTestament(OldTestament);
-	if (m_hasNT == -1)
-		m_hasNT = hasTestament(NewTestament);
-
-	if (m_hasOT)
-		m_lowerBound.key("Genesis 1:1");
-	else
-		m_lowerBound.key("Matthew 1:1");
-	if (!m_hasNT)
-		m_upperBound.key("Malachi 4:6");
-	else
-		m_upperBound.key("Revelation of John 22:21");
-}
-
-
-/** Returns the books available in this module */
-QStringList* const CSwordBibleModuleInfo::books() {
-	if (m_cachedLocale != backend()->booknameLanguage()){	//if the locale has changed
-		delete m_bookList;
-		m_bookList = 0;
-	}
-
-	if (!m_bookList) {
-		m_bookList = new QStringList();
-
-		initBounds();
-		int min = 0;
-		int max = 1;
-		//find out if we have ot and nt, only ot or only nt
-		if (m_hasOT>0 && m_hasNT>0) { //both
-			min = 0;
-			max = 1;
-		}
-		else if (m_hasOT>0 && !m_hasNT) { //only OT
-			min = 0;
-			max = 0;
-		}
-		else if (!m_hasOT && m_hasNT>0) { //only NT
-			min = 1;
-			max = 1;
-		}
-		else if (!m_hasOT && !m_hasNT) { //somethings wrong here! - no OT and no NT
-			qWarning("CSwordBibleModuleInfo (%s) no OT and not NT! Check your config!", module()->Name());
-			min = 0;
-			max = -1;
-		}
-
-		staticKey.setLocale(sword::LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
-		for (int i = min; i <= max; ++i) {
-			for ( int j = 0; j < staticKey.BMAX[i]; ++j) {
-//			if (backend()->useICU())
-//      	m_bookList->append( QString::fromUtf8(staticKey.books[i][j].name) );
-//      else
-        m_bookList->append( QString::fromLocal8Bit(staticKey.books[i][j].name) );
-			}
-		}
-		m_cachedLocale = backend()->booknameLanguage();
-	}
-	return m_bookList;
-}
-
-/** Returns the number of chapters for the given book. */
-const unsigned int CSwordBibleModuleInfo::chapterCount(const unsigned int book) {
-	int result = 0;
- 	if ( (book >= 1) && book <= (unsigned int)staticKey.BMAX[0] && hasTestament(OldTestament)) {		//Is the book in the old testament?
-     result = (staticKey.books[0][book-1].chapmax);
- 	}
- 	else if ((book >= 1) && (book - staticKey.BMAX[0]) <= (unsigned int)staticKey.BMAX[1] && hasTestament(NewTestament) ) {	//is the book in the new testament?
- 	 	result = (staticKey.books[1][book-1-staticKey.BMAX[0]].chapmax);
- 	}
-	return result;
-}
-
-const unsigned int CSwordBibleModuleInfo::chapterCount(const QString& book) {
-  return chapterCount( bookNumber(book) );
-}
-
-/** Returns the number of verses  for the given chapter. */
-
-const unsigned int CSwordBibleModuleInfo::verseCount( const unsigned int book, const unsigned int chapter ) {
-	unsigned int result = 0;
-
- 	if (book>=1 && (book <= (unsigned int)staticKey.BMAX[0]) && hasTestament(OldTestament) ) { //Is the book in the old testament?
- 		if (chapter <= chapterCount(book) )	//does the chapter exist?
- 			result = (staticKey.books[0][book-1].versemax[chapter-1]);
- 	}
- 	else if (book>=1 && (book - staticKey.BMAX[0]) <= (unsigned int)staticKey.BMAX[1] && hasTestament(NewTestament)) {	//is the book in the new testament?
- 		if (chapter <= chapterCount(book) )	//does the chapter exist?
- 			result = staticKey.books[1][book-1-staticKey.BMAX[0]].versemax[chapter-1];
- 	}
-	return result;
-}
-
-const unsigned int CSwordBibleModuleInfo::verseCount( const QString& book, const unsigned int chapter ) {
-//  qWarning("book is %s", book.latin1());
-  return verseCount( bookNumber(book), chapter );
-}
-
-const unsigned int CSwordBibleModuleInfo::bookNumber(const QString &book){
-	unsigned int bookNumber = 0;
-	bool found = false;
-	staticKey.setLocale(sword::LocaleMgr::systemLocaleMgr.getDefaultLocaleName());
-	int min = 0;
-	int max = 1;
-
-	//find out if we have ot and nt, only ot or only nt
-	initBounds();
-	if ((m_hasOT>0 && m_hasNT>0) || (m_hasOT == m_hasNT == -1)) {
-		min = 0;
-		max = 1;
-		bookNumber = 0;
-	}
-	else if (m_hasOT>0 && !m_hasNT) {
-		min = 0;
-		max = 0;
-		bookNumber = 0;
-	}
-	else if (!m_hasOT && m_hasNT>0) {
-		min = 1;
-		max = 1;
-		bookNumber = staticKey.BMAX[0];
-	}
-	else if (!m_hasOT && !m_hasNT) {
-		min = 0;
-		max = -1; //no loop
-		bookNumber = 0;
-	}
-
-	for (int i = min; i <= max && !found; ++i) {
-		for ( int j = 0; j < staticKey.BMAX[i] && !found; ++j) {
-			++bookNumber;
-			if (book == QString::fromLocal8Bit( staticKey.books[i][j].name) )
-//			if (book == QString::fromUtf8( staticKey.books[i][j].name) )
-				found = true;
-		}
-	}
-	return bookNumber;
-}
-
-/** Returns true if his module has the text of desired type of testament */
-const bool CSwordBibleModuleInfo::hasTestament( CSwordBibleModuleInfo::Testament type ) {
-  if (m_hasOT == -1 || m_hasNT == -1) {
-    module()->setSkipConsecutiveLinks(true);
-		*module() = sword::TOP; //position to first entry
-		sword::VerseKey key( module()->KeyText() );
-		if (key.Testament() == 1) { // OT && NT
-			m_hasOT = 1;
-		}
-		else if (key.Testament() == 2) { //no OT
-			m_hasOT = 0;
-		}
-
-		*module() = sword::BOTTOM;
-		key = module()->KeyText();
-		if (key.Testament() == 1) { // only OT, no NT
-			m_hasNT = 0;
-		}
-		else if (key.Testament() == 2) { //has NT
-			m_hasNT = 1;
-		}
-    module()->setSkipConsecutiveLinks(false);
-	}
-
-	switch (type) {
-		case OldTestament:
-			return m_hasOT>0;
-		case NewTestament:
-			return m_hasNT>0;
-
-		default:
-			return false;
-	}
-}
-
-/** Returns the key which represents the lower bound of this module. */
-CSwordVerseKey CSwordBibleModuleInfo::lowerBound() {
-	initBounds();
-  return m_lowerBound;
-}
-
-/** Returns the key which represents the lower bound of this module. */
-CSwordVerseKey CSwordBibleModuleInfo::upperBound() {
-	initBounds();
-  return m_upperBound;
-}
diff --git a/bibletime/backend/cswordbiblemoduleinfo.h b/bibletime/backend/cswordbiblemoduleinfo.h
deleted file mode 100644
index 0067def..0000000
--- a/bibletime/backend/cswordbiblemoduleinfo.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/***************************************************************************
-                          cswordbiblemoduleinfo.h  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDBIBLEMODULEINFO_H
-#define CSWORDBIBLEMODULEINFO_H
-
-//own includes
-#include "cswordmoduleinfo.h"
-#include "cswordversekey.h"
-
-//Qt includes
-#include <qstringlist.h>
-
-//Sword includes
-
-
-/**
-	* This is the CModuleInfo imlementation for Bible modules managed by Sword.
-	*	
-	*	@short Implementation for Sword Bibles
-  *	@author The BibleTime team
-  * @version $Id: cswordbiblemoduleinfo.h,v 1.12 2004/01/29 00:36:48 joachim Exp $
-  */
-class CSwordBibleModuleInfo : public CSwordModuleInfo  {
-public:
-	enum Testament {
-		OldTestament = 1,
-		NewTestament = 2
-	};
-
-	/**
-	* The constructor of this class
-	*/
-	CSwordBibleModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend()  );
-	CSwordBibleModuleInfo( const CSwordBibleModuleInfo& m );
-	/**
-	* The destructor of this class
-	*/
-	~CSwordBibleModuleInfo();
-  /**
- 	* Returns the number of avalable verses for the given chapter and book.
- 	*
- 	* @param book The book we should use
- 	* @param chapter The chapter we should use
- 	* @return The number of verses for the given book and chapter
- 	*/
-  virtual const unsigned int verseCount( const unsigned int book, const unsigned int chapter );
-  virtual const unsigned int verseCount( const QString& book, const unsigned int chapter );
-  /**
- 	* @return The number of available chapters of the given book.
- 	* @return The number of chapters for the given book
- 	*/
-  virtual const unsigned int chapterCount( const unsigned int book );
-  /**
- 	* @return The number of available chapters of the given book.
- 	* @return The number of chapters for the given book
- 	*/
-  virtual const unsigned int chapterCount( const QString& book );
-  /** Return all book of this module.
-  * @return A QStringList containing the books which are available in this module.
-  */
-  virtual QStringList* const books();
-  /**
-  * Reimplementation, Returns the type
-  */
-  virtual const CSwordModuleInfo::ModuleType type() const;
-  /**
-  * @return the book number, values starting with 1; 0 if not found
-  */
-  const unsigned int bookNumber(const QString &book);
-  /**
-  * Returns true if his module has the text of desired type of testament
-  */
-  const bool hasTestament( CSwordBibleModuleInfo::Testament );
-  virtual CSwordModuleInfo* clone();
-  /**
-  * Returns the key which represents the lower bound of this module.
-  */
-  CSwordVerseKey lowerBound();
-  /**
-  * Returns the key which represents the upper bound of this module.
-  */
-  CSwordVerseKey upperBound();
-
-private:
-	void initBounds();
-
-  CSwordVerseKey m_lowerBound;
-  CSwordVerseKey m_upperBound;
-
-  QStringList*	m_bookList;	//This booklist is cached
-	QString m_cachedLocale;
-	short int m_hasOT;
-	short int m_hasNT;
-};
-
-inline const CSwordModuleInfo::ModuleType CSwordBibleModuleInfo::type() const {
-	return CSwordModuleInfo::Bible;
-}
-
-
-#endif
diff --git a/bibletime/backend/cswordbookmoduleinfo.cpp b/bibletime/backend/cswordbookmoduleinfo.cpp
deleted file mode 100644
index ad4d13d..0000000
--- a/bibletime/backend/cswordbookmoduleinfo.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/***************************************************************************
-                          cswordbookmoduleinfo.cpp  -  description
-                             -------------------
-    begin                : Thu Jan 24 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordbookmoduleinfo.h"
-#include "cswordtreekey.h"
-
-//Sword includes
-#include <treekeyidx.h>
-#include <treekey.h>
-
-#include <iostream>
-#include <string>
-using std::cout;
-using std::endl;
-
-CSwordBookModuleInfo::CSwordBookModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend ) 
-	: CSwordModuleInfo(module, usedBackend),
-		m_depth(-1) 
-{
-
-}
-
-CSwordBookModuleInfo::CSwordBookModuleInfo( const CSwordBookModuleInfo& module )
-	: CSwordModuleInfo(module)
-{
-	m_depth = module.m_depth;
-}	
-
-CSwordBookModuleInfo::~CSwordBookModuleInfo(){
-}
-
-const int CSwordBookModuleInfo::depth() {
-	if (m_depth == -1) {
-  	sword::TreeKeyIdx* key = tree();
-  	if (key) {
-    	key->root();
-			computeDepth(key, 0);
-		}
-	}
-	return m_depth;
-}
-
-void CSwordBookModuleInfo::computeDepth(sword::TreeKeyIdx* key, int level ){
-  std::string savedKey;
-  savedKey = key->getFullName();
-  if (level > m_depth) {
-		m_depth = level;
-  }
-
-  if (key->hasChildren()) {
-    key->firstChild();
-    computeDepth(key, level+1);
-    
-    key->setText( savedKey.c_str() );//return to the initial value    
-  }
-  if (key->nextSibling()) {
-		computeDepth(key, level);
-  }
-}
-
-/** Returns a treekey filled with the structure of this module */
-sword::TreeKeyIdx* const  CSwordBookModuleInfo::tree() const {
-	sword::TreeKeyIdx* treeKey = dynamic_cast<sword::TreeKeyIdx*>((sword::SWKey*)*(module()));
-  Q_ASSERT(treeKey);
-	return treeKey;
-}
diff --git a/bibletime/backend/cswordbookmoduleinfo.h b/bibletime/backend/cswordbookmoduleinfo.h
deleted file mode 100644
index 0d65231..0000000
--- a/bibletime/backend/cswordbookmoduleinfo.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/***************************************************************************
-                          cswordbookmoduleinfo.h  -  description
-                             -------------------
-    begin                : Thu Jan 24 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDGENBOOKMODULEINFO_H
-#define CSWORDGENBOOKMODULEINFO_H
-
-//BibleTime includes
-#include "cswordmoduleinfo.h"
-
-//Sword includes
-#include <treekeyidx.h>
-
-
-/** Class for generic book support
-  * @author The BibleTime team
-  */
-class CSwordBookModuleInfo : public CSwordModuleInfo  {
-public: 
-	CSwordBookModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() );
-	CSwordBookModuleInfo( const CSwordBookModuleInfo& m );	
-	~CSwordBookModuleInfo();
-  /**
-  * Returns the type of the module.
-  */
-  virtual const CSwordModuleInfo::ModuleType type() const;
-  /**
-  * Returns the maximal depth of sections and subsections.
-  */
-  const int depth();
-  /**
-  * @return A treekey filled with the structure of this module. Don't delete the returned key because it's casted from the module object.
-  */
-  sword::TreeKeyIdx* const tree() const;
-
-private:
-  /**
-  * A recursive helper function to help computng the module depth!
-  */
-  void computeDepth(sword::TreeKeyIdx* key, int level = 0 );	
-	int m_depth;
-};
-
-inline const CSwordBookModuleInfo::ModuleType CSwordBookModuleInfo::type() const {
-	return CSwordModuleInfo::GenericBook;
-}
-
-
-#endif
diff --git a/bibletime/backend/cswordcommentarymoduleinfo.cpp b/bibletime/backend/cswordcommentarymoduleinfo.cpp
deleted file mode 100644
index 54e2ad0..0000000
--- a/bibletime/backend/cswordcommentarymoduleinfo.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
-                          cswordcommentarymoduleinfo.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cswordcommentarymoduleinfo.h"
-
-#include <string>
-
-CSwordCommentaryModuleInfo::CSwordCommentaryModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend)
-	: CSwordBibleModuleInfo(module, usedBackend) 
-{	
-
-}
-
-CSwordCommentaryModuleInfo::~CSwordCommentaryModuleInfo(){
-
-}
-
-/** No descriptions */
-CSwordModuleInfo* CSwordCommentaryModuleInfo::clone(){
-	return new CSwordCommentaryModuleInfo(*this);
-}
-
-/** Returns true if this module may be written by the write display windows. */
-const bool CSwordCommentaryModuleInfo::isWritable(){
-//  qWarning(module()->getConfigEntry("ModDrv"));
-  //a module is only writable if it's a RawFiles module with writable returning true
-  if ( (std::string(module()->getConfigEntry("ModDrv")) == std::string("RawFiles")) && module()->isWritable()) {
-    return true;
-  };
-  return false;
-}
diff --git a/bibletime/backend/cswordcommentarymoduleinfo.h b/bibletime/backend/cswordcommentarymoduleinfo.h
deleted file mode 100644
index 4af59aa..0000000
--- a/bibletime/backend/cswordcommentarymoduleinfo.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/***************************************************************************
-                          cswordcommentarymoduleinfo.h  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDCOMMENTARYMODULEINFO_H
-#define CSWORDCOMMENTARYMODULEINFO_H
-
-//own includes
-#include "cswordbiblemoduleinfo.h"
-
-/**
-  * @author The BibleTime team
-  * @version $Id: cswordcommentarymoduleinfo.h,v 1.7 2004/01/29 00:36:48 joachim Exp $
-  */
-class CSwordCommentaryModuleInfo : public CSwordBibleModuleInfo  {
-public:
-	CSwordCommentaryModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() );
-	~CSwordCommentaryModuleInfo();
-  virtual const CSwordModuleInfo::ModuleType type() const;
-  virtual CSwordModuleInfo* clone();
-  /**
-  * Returns true if this module may be written by the write display windows.
-  */
-  virtual const bool isWritable();
-};
-
-/** No descriptions */
-inline const CSwordModuleInfo::ModuleType CSwordCommentaryModuleInfo::type() const{
-	return CSwordModuleInfo::Commentary;
-}
-
-#endif
diff --git a/bibletime/backend/cswordkey.cpp b/bibletime/backend/cswordkey.cpp
deleted file mode 100644
index edbd6e6..0000000
--- a/bibletime/backend/cswordkey.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-/***************************************************************************
-                          cswordkey.cpp  -  description
-                             -------------------
-    begin                : Thu May 24 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-
-//own includes
-#include "cswordkey.h"
-#include "cswordmoduleinfo.h"
-
-#include "cswordversekey.h"
-#include "cswordldkey.h"
-#include "cswordtreekey.h"
-
-//Sword includes
-#include <swmodule.h>
-#include <swkey.h>
-#include <versekey.h>
-#include <treekey.h>
-#include <treekeyidx.h>
-
-
-CSwordKey::CSwordKey(CSwordModuleInfo* module) : m_module(module) {
-}
-
-CSwordKey::CSwordKey(const CSwordKey& k) {
-	m_module = k.m_module;
-}
-
-CSwordModuleInfo* const CSwordKey::module(CSwordModuleInfo* const newModule) {
-	if (newModule)
-		m_module = newModule;
-	return m_module;
-}
-
-const QString CSwordKey::rawText() {
-  if (!m_module) {
-		return QString::null;
-	}
-
-	if (sword::SWKey* k = dynamic_cast<sword::SWKey*>(this)) {
-    m_module->module()->SetKey(k);
-	}
-  if (key().isNull()) {
-    return QString::null;
-  }
-  return QString::fromUtf8(m_module->module()->getRawEntry());
-}
-
-const QString CSwordKey::renderedText( const CSwordKey::TextRenderType mode) {
-//	qWarning("const QString CSwordKey::renderedText()");
-  if (!m_module)
-		return QString::null;
-
-	if (sword::SWKey* k = dynamic_cast<sword::SWKey*>(this)) {
-    m_module->module()->SetKey(k);
-	}
-  if (!key().isNull()) {
-    //we have valid text
-    const QString text = QString::fromUtf8(m_module->module()->RenderText());
-    if (mode == HTMLEscaped) {
-      //we have to encode all UTF-8 in HTML escapes
-      // go though every character and write down the escaped HTML unicode entity
-      // form is &#<decimal unicode value here>;
-      QString ret;
-      QChar c;
-      const unsigned int length = text.length();
-      for (unsigned int i = 0; i < length; ++i) {
-        c = text.at(i);
-        if (c.latin1()) //normal latin1 character
-          ret += c;
-        else //unicode character, needs to be escaped
-          ret += QString::fromLatin1("&#%1;").arg(c.unicode());
-      };
-      return ret;
-    }
-    else {
-      return text;
-    }
-  }
-  return QString::null;
-}
-
-const QString CSwordKey::strippedText() {
-//	qWarning("const QString CSwordKey::strippedText()");
-  if (!m_module)
-		return QString::null;
-	if (sword::SWKey* k = dynamic_cast<sword::SWKey*>(this)) {
-		m_module->module()->SetKey(k);
-  }
-	return QString::fromUtf8(m_module->module()->StripText());
-}
-
-/** This will create a proper key object from a given module */
-CSwordKey* CSwordKey::createInstance( CSwordModuleInfo* const module ){
-	if (!module)
-		return 0;
-
-	switch( module->type() ){
-		case CSwordModuleInfo::Bible://fall through
-		case CSwordModuleInfo::Commentary:
-			return new CSwordVerseKey( (sword::VerseKey *) ( (sword::SWKey *)(*module->module()) ), module );
-		case CSwordModuleInfo::Lexicon:
-			return new CSwordLDKey( (sword::SWKey *)(*module->module()), module);
-		case CSwordModuleInfo::GenericBook:
-			return new CSwordTreeKey( (sword::TreeKeyIdx*)((sword::SWKey *)(*module->module())), module );
-		default:
-			return 0;
-	}
-}
-
-/** The assignment operator for more easy use of the key classes. */
-CSwordKey& CSwordKey::operator = ( const QString& newKey ){
-  key(newKey);
-  return *this;
-}
diff --git a/bibletime/backend/cswordkey.h b/bibletime/backend/cswordkey.h
deleted file mode 100644
index f5c774f..0000000
--- a/bibletime/backend/cswordkey.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
-                          cswordkey.h  -  description
-                             -------------------
-    begin                : Thu May 24 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDKEY_H
-#define CSWORDKEY_H
-
-//Own includes
-
-
-//Qt includes
-#include <qstring.h>
-
-
-class CSwordModuleInfo;
-/**
- * The base class for all Sword based keys.
- * @author The BibleTime team
- * @version $Id: cswordkey.h,v 1.14 2003/01/02 18:42:19 joachim Exp $
- */
-class CSwordKey {
-
-protected:
-	CSwordKey(CSwordModuleInfo* module = 0); //protected constructor, because CSwordKey shouldn't be used (it's an abstract base class).
-	CSwordKey(const CSwordKey&); //copy constructor
-
-public:
-
-  enum TextRenderType {
-    Normal = 0,
-    HTMLEscaped
-  };
-
-	virtual ~CSwordKey() {};
-	
-	
-	//pure virtual functions		
-	virtual const QString key() = 0;
-	virtual void key(const QString&) = 0;
-	virtual void key(const char*) = 0;
-	virtual CSwordKey* copy() const = 0;	
-	
-	//implemented functions
-	virtual CSwordModuleInfo* const module(CSwordModuleInfo* const newModule = 0);
-	virtual const QString rawText();
-  virtual const QString renderedText( const CSwordKey::TextRenderType mode = CSwordKey::Normal );
-	virtual const QString strippedText();
-  /**
-  * This returns a new object of the right CSwordKey* implementation (e.g. CSwordVerseKey or CSwordLDKey)
-  * The type is determined by the type of the module.
-  * @see CSwordModuleInfo, CSwordBibleModuleInfo, CSwordCommentaryModuleInfo, CSwordLexiconModukleInfo
-  */
-  static CSwordKey* createInstance(CSwordModuleInfo * const module);
-  /**
-  * The assignment operator for more easy use of the key classes.
-  */
-  virtual CSwordKey& operator = ( const QString& );
-
-protected:
-	CSwordModuleInfo* m_module; //module pointer used by all keys
-};
-
-#endif
diff --git a/bibletime/backend/cswordldkey.cpp b/bibletime/backend/cswordldkey.cpp
deleted file mode 100644
index 5522a8d..0000000
--- a/bibletime/backend/cswordldkey.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/***************************************************************************
-                          cswordldkey.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordldkey.h"
-#include "cswordlexiconmoduleinfo.h"
-
-//Qt includes
-
-//Sword includes
-#include <swmodule.h>
-#include <swld.h>
-#include <utilstr.h>
-
-
-CSwordLDKey::CSwordLDKey( CSwordModuleInfo* module ) {
-	if ((m_module = dynamic_cast<CSwordLexiconModuleInfo*>(module))) {
-//    *(m_module->module()) = TOP;	
-  }
-  SWKey::operator = (" ");
-}
-
-/** No descriptions */
-CSwordLDKey::CSwordLDKey( const CSwordLDKey &k ) : CSwordKey(k), SWKey((const char*)k) {
-}
-
-/** No descriptions */
-CSwordLDKey::CSwordLDKey( const SWKey *k, CSwordModuleInfo* module) : CSwordKey(module), SWKey(*k) {
-}
-
-/** Clones this object by copying the members. */
-CSwordLDKey* CSwordLDKey::copy() const {
-	return new CSwordLDKey(*this);
-}
-
-/** Sets the module of this key. */
-CSwordModuleInfo* const CSwordLDKey::module(CSwordModuleInfo* const newModule){	
-	if (newModule && newModule->type() == CSwordModuleInfo::Lexicon) {
-		const QString oldKey = key();	
-		m_module = newModule;
-		key(oldKey);
-	}	
-	return m_module;
-}
-
-/** Sets the key of this instance */
-const QString CSwordLDKey::key(){
-// 	return QString::fromLocal8Bit((const char*)*this);//don't use fromUtf8
- 	return QString::fromUtf8((const char*)*this);
-}
-
-void CSwordLDKey::key( const QString& newKey ){
-//	SWKey::operator = ((const char*)newKey.local8Bit());		
-	SWKey::operator = ((const char*)newKey.utf8());		
-	m_module->module()->SetKey(this);
-	m_module->snap();
-	SWKey::operator = (m_module->module()->KeyText());
-}
-
-/** Uses the parameter to returns the next entry afer this key. */
-CSwordLDKey* CSwordLDKey::NextEntry(){
-	m_module->module()->SetKey(this);	//use this key as base for the next one!
-  m_module->module()->setSkipConsecutiveLinks(true);  
-	( *( m_module->module() ) )++;
-  m_module->module()->setSkipConsecutiveLinks(false);    
-	key(m_module->module()->KeyText());
-	SWKey::operator = (m_module->module()->KeyText());	
-	
-	return this;
-}
-
-/** Uses the parameter to returns the next entry afer this key. */
-CSwordLDKey* CSwordLDKey::PreviousEntry(){
-	m_module->module()->SetKey(this);	//use this key as base for the next one!		
-  m_module->module()->setSkipConsecutiveLinks(true);
-  ( *( m_module->module() ) )--;
-  m_module->module()->setSkipConsecutiveLinks(false);
-	SWKey::operator = (m_module->module()->KeyText());	
-	
-	return this;
-}
-
-/** Sets the key of this instance */
-void CSwordLDKey::key( const char* newKey ){
-	if (newKey) {
-		SWKey::operator = (newKey);
-
-		m_module->module()->SetKey(this);
-		m_module->snap();
-		SWKey::operator = (m_module->module()->KeyText());
-	}
-}
-
-/** Assignment operator for more ease of use of this class. */
-CSwordLDKey& CSwordLDKey::operator = (const QString& keyname ){
-  key(keyname);
-  return *this;
-}
diff --git a/bibletime/backend/cswordldkey.h b/bibletime/backend/cswordldkey.h
deleted file mode 100644
index 951781b..0000000
--- a/bibletime/backend/cswordldkey.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/***************************************************************************
-                          cswordldkey.h  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************
-
- ***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDLDKEY_H
-#define CSWORDLDKEY_H
-
-
-//own includes
-#include "cswordkey.h"
-#include "cswordmoduleinfo.h"
-
-//Qt includes
-#include <qstring.h>
-
-//Sword includes
-#include <swkey.h>
-
-/**
-	*	This class is the implementation of CKey used for dictionaries and lexicons.
-	*
-	*	CSwordLDKey is the implementation of CKey for Lexicons and dictionaries.
-	* It provides a simple interface to set the current key,
-	* to get the text for the key and functions to get the next and previous items
-	* of the used module in comparision to the current key.<BR>
-	* Here's an example how to use this class:<BR>
-	* @code
-	*		CSwordLexiconModuleInfo* m_module = new CSwordLexiconModuleInfo( sword_module );
-	*		CSwordLDKey* ldKey = new CSwordLDKey(m_module);
-	*		ldKey->getPreviousEntry( ldKey );
-	*		qDebug( QString("The current key is: %1").arg(QString::fromLocal8Bit((const char*)*ldKey)));
-	* @endcode
-	*
-	* Please not, that the result will be invalid if use the operator const char*
-	* on the adress of the object, use something like this
-  *
-	* @code
-	*		CSwordLDKey* key = new CSwordLDKey( lexicon_module );
-	*		const QString keyname = key->getKey();
-	* @endcode
-	*
-  *	@author The BibleTime team
-  *	@version $Id: cswordldkey.h,v 1.13 2002/10/01 20:55:49 mgruner Exp $
-  */
-
-class CSwordLDKey : public CSwordKey, public sword::SWKey {
-public: 
-	/**
-	* Constructor of CSwordLDKey
-	*/
-	CSwordLDKey( CSwordModuleInfo* module );
-	/**
-	* Copy constructor for this key class.
-	*/
-	CSwordLDKey( const CSwordLDKey &k );
-	/**
-	* Copy constructor for this key class.
-	*/
-	CSwordLDKey( const sword::SWKey *k, CSwordModuleInfo* module);
-//	virtual ~CSwordLDKey();
-  /**
-  * Clones this object by copying the members.
-  */
-  virtual CSwordLDKey* copy() const;
-  /**
-  * Uses the parameter to returns the next entry afer this key.
-  */
-  CSwordLDKey* NextEntry( void );
-  /**
-  * Uses the parameter to returns the previous entry afer this key.
-  */
-  CSwordLDKey* PreviousEntry( void );  	
-  /**
-  * Sets the module of this key.
-  */
-  virtual CSwordModuleInfo* const module( CSwordModuleInfo* const module = 0 );
-  /**
-  * Returns the current key as a QString
-  */
-  virtual const QString key();
-  /**
-  * Set the current key
-  */
-  virtual void key( const QString& newKey );
-  /**
-  * Returns the current key as a QString
-  */
-  virtual void key( const char* );
-  /** Assignment operator for more ease of use of this class. */
-  virtual CSwordLDKey& operator = (const QString& keyname );
-};
-
-
-#endif
-
diff --git a/bibletime/backend/cswordlexiconmoduleinfo.cpp b/bibletime/backend/cswordlexiconmoduleinfo.cpp
deleted file mode 100644
index 26416c7..0000000
--- a/bibletime/backend/cswordlexiconmoduleinfo.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-/***************************************************************************
-                          cswordlexiconmoduleinfo.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordlexiconmoduleinfo.h"
-#include "frontend/cbtconfig.h"
-
-//Qt includes
-#include <qfile.h>
-#include <qdatastream.h>
-
-//Sword includes
-#include <swmodule.h>
-
-#include <kglobal.h>
-#include <kstandarddirs.h>
-
-//Change it once the format changed to make all
-//systems rebuild their caches
-#define CACHE_FORMAT "2"
-
-CSwordLexiconModuleInfo::CSwordLexiconModuleInfo( sword::SWModule* module, CSwordBackend* const backend ) : CSwordModuleInfo(module, backend) {
-	m_entryList = 0;
-}
-
-CSwordLexiconModuleInfo::CSwordLexiconModuleInfo( const CSwordLexiconModuleInfo& m ) : CSwordModuleInfo(m) {
-	delete m_entryList;
-	m_entryList = 0;	
-		
-	if (m.m_entryList) {
-		m_entryList = new QStringList();
-		*m_entryList = *m.m_entryList;//copy list items
-	}
-}
-
-CSwordLexiconModuleInfo::~CSwordLexiconModuleInfo(){
-	delete m_entryList;
-	m_entryList = 0;
-}
-
-/** Returns the entries of the module. */
-QStringList* const CSwordLexiconModuleInfo::entries(){
-	if (!module()) {
-		return 0;
-	}
-
-  if (!m_entryList) {
-		m_entryList = new QStringList();
-    const bool lexiconCache = CBTConfig::get(CBTConfig::lexiconCache);
-		bool read = false;
-
-		if (lexiconCache){
-  		QFile f1(
-  			QString::fromLatin1("%1/%2")
-  				.arg(KGlobal::dirs()->saveLocation("data", "bibletime/cache/"))
-  				.arg(name())
-  		);
-
-      if ( f1.open( IO_ReadOnly ) ){
-        QDataStream s( &f1 );
-  			QString mod_ver, prog_ver;
-        s >> mod_ver;
-        s >> prog_ver;
-  			if ((mod_ver == config(ModuleVersion)) && (prog_ver == CACHE_FORMAT)) {
-  				s >> *m_entryList;
-  				read = true;
-  			}
-  			f1.close();
-      }
-		}
-
-    if (!read || !m_entryList->count()){
-      module()->setSkipConsecutiveLinks(true);
-			(*module()) = sword::TOP;
-      snap(); //snap to top entry
-  		do {
-        if (isUnicode()) {
-     			m_entryList->append(QString::fromUtf8(module()->KeyText()));
-				}
-        else { //for latin1 modules use fromLatin1 because of speed
-          m_entryList->append(QString::fromLatin1(module()->KeyText()));
-				}
-  			(*module())++;
-  		} while ( !module()->Error() );
-			(*module()) = sword::TOP; //back to the first entry
-      module()->setSkipConsecutiveLinks(false);
-
-      if (m_entryList->count()) {
-        m_entryList->first().simplifyWhiteSpace();
-    		if (m_entryList->first().stripWhiteSpace().isEmpty()) {
-  	  		m_entryList->remove( m_entryList->begin() );
-				}
-      }
-
-			if (lexiconCache && m_entryList->count()){
-  			//create cache
-		 		QString dir = KGlobal::dirs()->saveLocation("data", "bibletime/cache/");
-        QFile f2( QString::fromLatin1("%1/%2").arg(dir).arg( name() ) );
-        if (f2.open( IO_WriteOnly )){
-          QDataStream s( &f2 );
-  				s << config(CSwordModuleInfo::ModuleVersion); //store module version
-					s << QString::fromLatin1(CACHE_FORMAT); //store BT version -- format may change
-  				s << *m_entryList;
-  			  f2.close();
-        }
-			}
-		}
-	}
-	return m_entryList;
-}
-
-/** Jumps to the closest entry in the module.  */
-const bool CSwordLexiconModuleInfo::snap(){
-	if(module()->getRawEntry()){	//snap to the current entry
-		return true;
-	}
-	return false;
-}
-
-/** No descriptions */
-CSwordModuleInfo* CSwordLexiconModuleInfo::clone(){
-	return new CSwordLexiconModuleInfo(*this);
-}
diff --git a/bibletime/backend/cswordlexiconmoduleinfo.h b/bibletime/backend/cswordlexiconmoduleinfo.h
deleted file mode 100644
index c8caa22..0000000
--- a/bibletime/backend/cswordlexiconmoduleinfo.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
-                          cswordlexiconmoduleinfo.h  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDLEXICONMODULEINFO_H
-#define CSWORDLEXICONMODULEINFO_H
-
-//own includes
-#include "cswordmoduleinfo.h"
-
-//Qt includes
-#include <qstringlist.h>
-
-/**
-	* The implementation of CModuleInfo for the Sword lexiccons and citionaries.
-  * @author The BibleTime team
-  * @version $Id: cswordlexiconmoduleinfo.h,v 1.7 2004/01/29 00:36:48 joachim Exp $
-  */
-class CSwordLexiconModuleInfo : public CSwordModuleInfo {
-public: 
-	/**
-	* The standard constructor fot this object.
-	* A default constructor doesn't exist. Use this one.
-	*/
-	CSwordLexiconModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() );
-	/**
-	* The copy constructor
-	*/
-	CSwordLexiconModuleInfo( const CSwordLexiconModuleInfo& m );
-  virtual CSwordModuleInfo* clone();
-	~CSwordLexiconModuleInfo();	
-  /**
- 	* Returns the entries of the module.
- 	* This function returns the entries of the modules represented by this object.
- 	* If this function is called for the first time the list is load from disk and stored in a list which cahes it.
- 	* If the function is called again, the cached list is returned so we have a major speed improvement.
- 	*/
-  QStringList* const entries();
-  /**
-  * Reimplementation.
-  */
-  virtual const CSwordModuleInfo::ModuleType type() const;
-  /**
-  * Jumps to the closest entry in the module.
-  */
-  const bool snap();
-
-private:
-	/**
-	* This is the list which caches the entres of the module.
-	*/
-	QStringList* m_entryList;
-};
-
-inline const CSwordModuleInfo::ModuleType CSwordLexiconModuleInfo::type() const {
-	return CSwordModuleInfo::Lexicon;
-}
-
-#endif
diff --git a/bibletime/backend/cswordmoduleinfo.cpp b/bibletime/backend/cswordmoduleinfo.cpp
deleted file mode 100644
index 1474279..0000000
--- a/bibletime/backend/cswordmoduleinfo.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/***************************************************************************
-                          cswordmoduleinfo.cpp  -  description
-                             -------------------
-    begin                : Wed Oct 11 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordmoduleinfo.h"
-#include "cswordbackend.h"
-#include "centrydisplay.h"
-#include "cswordmodulesearch.h"
-#include "cswordkey.h"
-#include "clanguagemgr.h"
-#include "util/scoped_resource.h"
-
-#include <sys/types.h>
-#include <unistd.h>
-#include <stddef.h>
-#include <dirent.h>
-#include <regex.h>
-
-//Qt includes
-#include <qregexp.h>
-
-//Sword includes
-#include <swbuf.h>
-#include <swmodule.h>
-#include <swkey.h>
-#include <listkey.h>
-#include <versekey.h>
-#include <swconfig.h>
-#include <rtfhtml.h>
-
-using std::string;
-
-CSwordModuleInfo::CSwordModuleInfo( sword::SWModule* module, CSwordBackend* const usedBackend) {
-	m_module = module;
-	m_searchResult.ClearList();
-  m_backend = usedBackend;
-	m_dataCache.name = module ? QString::fromLatin1(module->Name()) : QString();
-	m_dataCache.isUnicode = module ? module->isUnicode() : false;
-
-	if (backend()) {
-		if (hasVersion() && (minimumSwordVersion() > sword::SWVersion::currentVersion)) {
-		 	qWarning("The module \"%s\" requires a newer Sword library. Please update to \"Sword %s\".", name().latin1(), (const char*)minimumSwordVersion());
-		}
-	}
-}
-
-CSwordModuleInfo::CSwordModuleInfo( const CSwordModuleInfo& m ) {
-	m_module = m.m_module;
-	m_backend = m.m_backend;
-	m_dataCache = m.m_dataCache;
-	m_searchResult = m.m_searchResult;
-}
-
-/** No descriptions */
-CSwordModuleInfo* CSwordModuleInfo::clone(){
-	return new CSwordModuleInfo(*this);
-}
-
-CSwordModuleInfo::~CSwordModuleInfo(){
-	m_searchResult.ClearList();
-	m_module = 0; //the Sword module object is deleted by the backend
-}
-
-/** Sets the unlock key of the modules and writes the key into the cofig file.*/
-const bool CSwordModuleInfo::unlock( const QString& unlockKey ){
-  if (!isEncrypted()) {
-    return false;
-  }
-
-  CBTConfig::setModuleEncryptionKey( name(), unlockKey );
-  backend()->setCipherKey(m_module->Name(), unlockKey.latin1());
-      
-  return false;
-}
-
-/** Returns the display object for this module. */
-CEntryDisplay* const CSwordModuleInfo::getDisplay() const {
-	return dynamic_cast<CEntryDisplay*>(m_module->Disp());
-}
-
-/** This function returns true if this module is locked, otherwise return false. */
-const bool CSwordModuleInfo::isLocked() {
-  //still works, but the cipherkey is stored in CBTConfig.
-	//Works because it is set in sword on program startup.
-	if (isEncrypted() && config(CipherKey).isEmpty())
-		return true;
-	return false;
-}
-
-/** This functions returns true if this module is encrypted (locked or unlocked). */
-const bool CSwordModuleInfo::isEncrypted()/* const*/ {
-	/**
-	* If we have the CipherKey entry the module
-	* is encrypted but not necessarily locked
-	*/
-	//This code is still right, though we do no longer write to the module config files any more
-	sword::ConfigEntMap config	= backend()->getConfig()->Sections.find( name().latin1() )->second;
-	sword::ConfigEntMap::iterator it = config.find("CipherKey");
-	if (it != config.end())
-		return true;
-//  if (!config(CipherKey).isEmpty()) {
-//    return true;
-//  };
-	return false;
-}
-
-const bool CSwordModuleInfo::hasVersion() const {
-	const sword::SWBuf version = (*backend()->getConfig())[name().latin1()]["Version"];
-	return version.length();
-}
-
-
-/** Returns true if something was found, otherwise return false. */
-const bool CSwordModuleInfo::search( const QString searchedText, const int searchOptions, sword::ListKey scope, void (*percentUpdate)(char, void*) ) {
-	int searchType = 0;
- 	int searchFlags = REG_ICASE;
-
-	//work around Swords thread insafety for Bibles and Commentaries
-	util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(this) );
-	sword::SWKey* s = dynamic_cast<sword::SWKey*>(key.get());
-	if (s) {
-		m_module->SetKey(*s);
-  }
-
-	//setup variables required for Sword
-	if (searchOptions & CSwordModuleSearch::caseSensitive)
-		searchFlags = 0;
-
-	if (searchOptions & CSwordModuleSearch::multipleWords) {
-		searchType = -2; //multiple words
-  }
-	else if (searchOptions & CSwordModuleSearch::exactPhrase) {
-		searchType = -1; //exact phrase
-  }
-	else if (searchOptions & CSwordModuleSearch::regExp) {
-		searchType = 0;	//regexp matching
-  }
-
-	if ((searchOptions & CSwordModuleSearch::useLastResult) && m_searchResult.Count()) {
-		util::scoped_ptr<sword::SWKey> searchScope( m_searchResult.clone() );
-		m_searchResult = m_module->search(searchedText.utf8(), searchType, searchFlags, searchScope, 0, percentUpdate);
-	}
-	else if (searchOptions & CSwordModuleSearch::useScope) {
-		m_searchResult = m_module->search(searchedText.utf8(), searchType, searchFlags, (type() != Lexicon && type() != GenericBook) ? &scope : 0, 0, percentUpdate);
-	}
-  else {
-  	m_searchResult = m_module->search(searchedText.utf8(), searchType, searchFlags, 0, 0, percentUpdate);
-  }
-
-	return (m_searchResult.Count() > 0);
-}
-
-/** Returns the last search result for this module. */
-sword::ListKey& CSwordModuleInfo::searchResult(const sword::ListKey* newResult) {
-	if (newResult) {
-		m_searchResult.copyFrom( *newResult );
-  }
-	return m_searchResult;
-}
-
-/** Clears the last search result. */
-void CSwordModuleInfo::clearSearchResult(){
-	m_searchResult.ClearList();
-}
-
-/** This interupts the search if this module is being searched. */
-void CSwordModuleInfo::interruptSearch(){
-	m_module->terminateSearch = true;
-}
-
-/** Returns the required Sword version for this module. Returns -1 if no special Sword version is required. */
-const sword::SWVersion CSwordModuleInfo::minimumSwordVersion(){
-	return sword::SWVersion( config(CSwordModuleInfo::MinimumSwordVersion).latin1() );
-}
-
-/** Returns the name of the module. */
-const QString CSwordModuleInfo::name() const {
-	return m_dataCache.name;
-}
-
-/** Returns true if this module is Unicode encoded. False if the charset is iso8859-1. */
-const bool CSwordModuleInfo::isUnicode(){
-	return m_dataCache.isUnicode;
-}
-
-const QString CSwordModuleInfo::config( const CSwordModuleInfo::ConfigEntry entry) {
-	switch (entry) {
-		case AboutInformation:
-		{
-			QString about = QString::fromLatin1(m_module->getConfigEntry("About"));
-			if (!about.isEmpty()) {	
-				sword::RTFHTML filter;
-				sword::SWBuf buf( about.local8Bit() );
-				filter.processText(buf, 0, 0);
-				about = QString::fromLocal8Bit(buf.c_str());
-			}
-			return about;
-		}
-		case CipherKey:
-      if (CBTConfig::getModuleEncryptionKey(name()).isNull()) { //fall back!
-  			return QString::fromLatin1( m_module->getConfigEntry("CipherKey") );
-      }
-      else {
-        return CBTConfig::getModuleEncryptionKey(name());
-      };
-		case AbsoluteDataPath: {
-			QString path = QString::fromLatin1(m_module->getConfigEntry("AbsoluteDataPath"));
-      path.replace(QRegExp("/./"), "/"); // make /abs/path/./modules/ looking better
-			//make sure we have a trailing slash!
-			if (path.right(1) != "/") {
-				path += "/";
-			}
-      return path;
-    }
-		case DataPath: { //make sure we remove the dataFile part if it's a Lexicon
-			QString path = QString::fromLatin1(m_module->getConfigEntry("DataPath"));
-			if ((type() == CSwordModuleInfo::GenericBook) || (type() == CSwordModuleInfo::Lexicon)) {
-				int pos = path.findRev("/"); //last slash in the string
-				if (pos != -1) {
-					path = path.left(pos+1); //include the slash
-				}
-			}
-			return path;
-		}
-		case Description:
-			return QString::fromLatin1(m_module->Description());
-		case ModuleVersion: {
-			QString version = QString::fromLatin1(m_module->getConfigEntry("Version"));
-      if (version.isEmpty())
-        version = "1.0";
-      return version;
-    }        
-		case MinimumSwordVersion: {
-			const QString version = QString::fromLatin1(m_module->getConfigEntry("MinimumVersion"));
-			return !version.isEmpty() ? version : QString::fromLatin1("0.0");
-		}
-		case TextDir: {
-			const QString dir = QString::fromLatin1(m_module->getConfigEntry("Direction"));
-			return !dir.isEmpty() ? dir : QString::fromLatin1("LtoR");
-		}		
-    case DisplayLevel: {
-			const QString level = QString::fromLatin1(m_module->getConfigEntry("DisplayLevel"));
-			return !level.isEmpty() ? level : QString::fromLatin1("1");
-		}
-    case GlossaryFrom: {
-      if (!category() == Glossary) {
-        return QString::null;
-      };
-      const QString lang = QString::fromLatin1(m_module->getConfigEntry("GlossaryFrom"));
-			return !lang.isEmpty() ? lang : QString::null;
-    }
-    case GlossaryTo: {
-      if (!category() == Glossary) {
-        return QString::null;
-      };
-      const QString lang = QString::fromLatin1(m_module->getConfigEntry("GlossaryTo"));
-			return !lang.isEmpty() ? lang : QString::null;
-    }
-		default:
-			return QString::null;
-	}
-}
-
-/** Returns true if the module supports the feature given as parameter. */
-const bool CSwordModuleInfo::has( const CSwordModuleInfo::Feature feature ){
-	switch (feature) {
-		case StrongsNumbers:
-			return m_module->getConfig().has("Feature", "StrongsNumber");
-		case GreekDef:
-			return m_module->getConfig().has("Feature", "GreekDef");		
-		case HebrewDef:
-			return m_module->getConfig().has("Feature", "HebrewDef");		
-		case GreekParse:
-			return m_module->getConfig().has("Feature", "GreekParse");		
-		case HebrewParse:
-			return m_module->getConfig().has("Feature", "HebrewParse");		
-	}
-	return false;
-}
-
-const bool CSwordModuleInfo::has( const CSwordBackend::FilterTypes option ){
-	//BAD workaround to see if the filter is GBF, OSIS or ThML!	
-  const QString name = backend()->configOptionName(option);
- 	if (m_module->getConfig().has("GlobalOptionFilter", QString::fromLatin1("OSIS%1").arg(name).latin1()))
- 		return true;
-  if (m_module->getConfig().has("GlobalOptionFilter", QString::fromLatin1("GBF%1").arg(name).latin1()))
- 		return true;
- 	if (m_module->getConfig().has("GlobalOptionFilter", QString::fromLatin1("ThML%1").arg(name).latin1()))
- 		return true;
- 	if (m_module->getConfig().has("GlobalOptionFilter", QString::fromLatin1("UTF8%1").arg(name).latin1()))
- 		return true; 		
- 	if (m_module->getConfig().has("GlobalOptionFilter", name.latin1()))
- 		return true;
- 	
- 	return false;
-}
-
-/** Returns the text direction of the module's text., */
-const CSwordModuleInfo::TextDirection CSwordModuleInfo::textDirection(){
-  if (config(TextDir) == "RtoL")
-    return CSwordModuleInfo::RightToLeft;
-  else
-    return CSwordModuleInfo::LeftToRight;
-}
-
-/** Writes the new text at the given position into the module. This does only work for writable modules. */
-void CSwordModuleInfo::write( CSwordKey* key, const QString& newText ){
-  module()->KeyText( key->key().local8Bit() );
-	//don't store a pointer to the const char* value somewhere because QCString doesn't keep the value of it
-	module()->setEntry( isUnicode() ? (const char*)newText.utf8() : (const char*)newText.local8Bit() );
-}
-
-/** Deletes the current entry and removes it from the module. */
-const bool CSwordModuleInfo::deleteEntry( CSwordKey* const key ){
-  module()->KeyText( key->key().local8Bit() );
-  if (module()) {
-    module()->deleteEntry();
-    return true;
-  };
-  return false;
-}
-
-/** Returns the language of the module. */
-const CLanguageMgr::Language CSwordModuleInfo::language() {
-  if (module()) {
-    if (category() == Glossary) {
-      //special handling for glossaries, we use the "from language" as language for the module
-      return languageMgr()->languageForAbbrev( config(GlossaryFrom) );
-    }
-    return languageMgr()->languageForAbbrev( module()->Lang() );
-  }
-  return CLanguageMgr::Language(); //default language
-}
-
-/** Returns true if this module may be written by the write display windows. */
-const bool CSwordModuleInfo::isWritable(){
-  return false;
-}
-
-/** Returns the category of this module. See CSwordModuleInfo::Category for possible values. */
-const CSwordModuleInfo::Category CSwordModuleInfo::category(){
-  const QString cat = QString::fromLatin1(m_module->getConfigEntry("Category"));
-  if (cat == QString::fromLatin1("Cults / Unorthodox / Questionable Material")) {
-    return Cult;
-  }
-  else if (cat == QString::fromLatin1("Daily Devotional") || m_module->getConfig().has("Feature", "DailyDevotion")) {
-    return DailyDevotional;
-  }
-  else if (cat == QString::fromLatin1("Glossaries") || m_module->getConfig().has("Feature", "Glossary")) { //alow both
-    return Glossary;
-  };
-  return CSwordModuleInfo::UnknownCategory;  
-}
diff --git a/bibletime/backend/cswordmoduleinfo.h b/bibletime/backend/cswordmoduleinfo.h
deleted file mode 100644
index 5104b96..0000000
--- a/bibletime/backend/cswordmoduleinfo.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/***************************************************************************
-                          cswordmoduleinfo.h  -  description
-                             -------------------
-    begin                : Wed Oct 11 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDMODULEINFO_H
-#define CSWORDMODULEINFO_H
-
-//BibleTime includes
-#include "cswordbackend.h"
-#include "clanguagemgr.h"
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qfont.h>
-#include <qmap.h>
-
-
-//Sword includes
-#include <listkey.h>
-#include <swversion.h>
-
-class sword::SWModule;
-class CSwordBackend;
-class CEntryDisplay;
-class CSwordKey;
-
-/**
-	* Base class for Sword modules.
-	* This is the base class for all Sword modules. Every class handling a special Sword module type
-	* does inherit from this class.
-	*
-  * @author The BibleTime team
-  * @version $Id: cswordmoduleinfo.h,v 1.44 2004/01/29 00:36:48 joachim Exp $
-  */
-class CSwordModuleInfo : public CPointers  {
-public:
-  enum TextDirection { /* The text direction of the modules's text */
-    LeftToRight,
-    RightToLeft
-  };
-  enum ModuleType {
-		Bible,
-		Commentary,
-		Lexicon,
-		GenericBook,
-		Unknown
-	};
-  /**
- 	* This enum is used to give
- 	* back an error code after unlocking the module
- 	*/
-  enum UnlockErrorCode {
-		noError,	/* No error occured, everything worked ok. The key was written to the config*/
-		wrongUnlockKey, /* The wrong key was used. Module is not unlocked */				
-		notLocked, /* The module was not locked so it can't be unlocked */
-		noPermission /* The key was not written to config because we have no permissions*/
-	};	
-	enum ConfigEntry {
-		AboutInformation, /* The about information of a module which is stored in the config file*/
-		AbsoluteDataPath, /* The absolute data path stored in the config object */
-		CipherKey, /* The cipher key which was used to unlock the module. Not necessarily set.*/
-		DataPath, /* The relative path. See AbsoluteDataPath*/
-		Description, /* The module description stored in the config file */
-		ModuleVersion, /* The module's version.*/
-		MinimumSwordVersion, /* The required Sword Version of this module. Otherwise some things may not work (compression etc.).*/
-	  TextDir, /* The text direction */	
-    DisplayLevel, /* Mostly used for books. Gives the level which should contain the connected entries.*/
-    GlossaryFrom, /* lamguage from which the Glosaary tramslates */
-    GlossaryTo /* lamguages to which the glossary maps to */
-	};
-	enum Feature {
-		StrongsNumbers, /*Use for Bibles which have embedded strong numbers*/
-		GreekDef,
-		HebrewDef, 
-		GreekParse,
-		HebrewParse,
-    featureMin = StrongsNumbers,
-    featureMax = HebrewParse
-	};
-  enum Category {
-    UnknownCategory = 0, /* The category wasn't set or has an unknwon value */
-    Cult, /* The module is a cult / sect / questionable module */
-    DailyDevotional,
-    Glossary
-  };
-	
-	/**
-	* Returns the config entry which is pecified by the parameter.
-	*/
-	const QString config( const CSwordModuleInfo::ConfigEntry entry );
-	
-	CSwordModuleInfo( sword::SWModule* module, CSwordBackend* const = CPointers::backend() );
-//	CSwordModuleInfo( sword::SWModule* module, CSwordBackend* const backend );
-	CSwordModuleInfo( const CSwordModuleInfo& m );	
-  virtual CSwordModuleInfo* clone();	
-	virtual ~CSwordModuleInfo();	
-
-  /**
- 	* Returns the module object so all objects can access the original Sword module.
- 	*/
-  sword::SWModule* const module() const;
-  /**
- 	* Sets the unlock key of the modules and writes the key into the cofig file.
-	* @return True if the unlock process was succesful, if the key was wrong, or if the config file was write protected return false.
-	*/
-  const bool unlock( const QString& unlockKey );
-  /**
- 	* Returns the display object for this module. Normally every module should have a Display object.
- 	* Please don't use module()->Display() because this function does return the Sword display and does
- 	* render the text, too.
- 	* This function performs some casts to return the correct display. If it returns 0 there's no valid
- 	* display object.
- 	*/
-  CEntryDisplay* const getDisplay() const;
-  /**
- 	* This function does return true if the data files of the module are encrypted by the module author
- 	* (the on who made the module) no matter if it's locked or not.
- 	*
- 	*/
-  const bool isEncrypted() /*const*/;
-  /**
- 	* This function returns true if this module is locked (encrypted + correct cipher key),
- 	* otherwise return false.
- 	*/
-  const bool isLocked();
-
-  /**
-  * @return true if this module has a version number and false if it doesn't have one.
-  */
-  const bool hasVersion() const;
-  /**
-  * Returns true if something was found, otherwise return false.
-  * This function does start the Sword functions to search in the module and it does
-  * overwrite the variable containing the last search result.
-  */
-  virtual const bool search( const QString searchedText, const int searchOptions, sword::ListKey scope, void (*percent)(char, void*));
-  /**
-  * Returns the last search result for this module.
-  * The last result is cleared by @ref search
-  */
-  virtual sword::ListKey& searchResult( const sword::ListKey* newResult = 0 );
-  /**
-  * This interupts the search if this module is being searched.
-  */
-  virtual void interruptSearch();
-  /**
-  * Clears the last search result.
-  * This does immediately clean the last search result,
-  * no matter if search is in progress or not.
-  */
-  void clearSearchResult();
-  /**
-  * Returns the type of the module.
-  */
-  virtual const CSwordModuleInfo::ModuleType type() const;
-  /**
-  * Returns the required Sword version for this module.
-	* Returns -1 if no special Sword version is required.
-	*/
-  const sword::SWVersion minimumSwordVersion();
-  /**
-  * Returns the name of the module.
-  */
-  const QString name() const;
-  /**
-  * Snaps to the closest entry in the module if the current key is
-  * not present in the data files.
-  */
-  virtual const bool snap() {return false;};
-  const bool has( const CSwordModuleInfo::Feature );
-	const bool has( const CSwordBackend::FilterTypes option )	;
-  /**
-  * Returns the text direction of the module's text.,
-  */
-  virtual const CSwordModuleInfo::TextDirection textDirection();
-  /**
-  * Writes the new text at the given position into the module. This does only work for writabe modules.
-  */
-  virtual void write( CSwordKey* key, const QString& newText );
-  /**
-  * Deletes the current entry and removes it from the module.
-  */
-  const bool deleteEntry( CSwordKey* const key );
-  /**
-  * Returns the language of the module.
-  */
-  const CLanguageMgr::Language language();
-  /**
-  * Returns true if this module may be written by the write display windows.
-  */
-  virtual const bool isWritable();
-  /**
-  * Returns the category of this module. See CSwordModuleInfo::Category for possible values.
-  */
-  const CSwordModuleInfo::Category category();
-
-protected:
-  friend class CSwordBackend;
-  /**
-  * Returns true if this module is Unicode encoded. False if the charset is iso8859-1.
-	* Protected because it should not be used outside of the CSword*ModuleInfo classes.
-  */
-  const bool isUnicode();
-
-  virtual inline CSwordBackend* backend() const {
-    return m_backend;
-  }
-  virtual inline void backend( CSwordBackend* newBackend ) {
-    if (newBackend) {
-      m_backend = newBackend;
-    }
-  }
-
-private:
-	sword::SWModule* m_module;
-	sword::ListKey m_searchResult;
-	struct {
-		QString name;
-		bool isUnicode;
-	} m_dataCache;
-
-  CSwordBackend* m_backend;
-};
-
-typedef QPtrList<CSwordModuleInfo>	ListCSwordModuleInfo;
-
-inline const CSwordModuleInfo::ModuleType CSwordModuleInfo::type() const {
-	return CSwordModuleInfo::Unknown;
-}
-
-inline sword::SWModule* const CSwordModuleInfo::module() const {
-	return m_module;
-}
-
-#endif
diff --git a/bibletime/backend/cswordmodulesearch.cpp b/bibletime/backend/cswordmodulesearch.cpp
deleted file mode 100644
index 4449007..0000000
--- a/bibletime/backend/cswordmodulesearch.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/***************************************************************************
-                          cswordmodulesearch.cpp  -  description
-                             -------------------
-    begin                : Fri Oct 13 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordmodulesearch.h"
-#include "cswordmoduleinfo.h"
-#include "cswordbackend.h"
-#include "../frontend/cbtconfig.h"
-
-//Sword includes
-#include <swmodule.h>
-#include <swkey.h>
-#include <listkey.h>
-
-
-static CSwordModuleSearch* searcher = 0;
-
-void startSearchCallback(void* /*p*/){
-	if (searcher)
-		searcher->startSearch();
-}
-
-void percentUpdateDummy(char percent, void *p) {
-	searcher->percentUpdate(percent, p);
-};
-
-CSwordModuleSearch::CSwordModuleSearch() :
-	m_searchedText(QString::null),
-	m_searchOptions(0),m_foundItems(false),m_isSearching(false),m_terminateSearch(false)
-{
-	searcher = this;
-}
-
-CSwordModuleSearch::~CSwordModuleSearch(){
-	searcher = 0;
-}
-
-void CSwordModuleSearch::percentUpdate(char percent, void *){
-	cms_currentProgress = (int)percent;
-	if (cms_module_count > 1)
-	  cms_overallProgress = (int)((float)((cms_module_current - 1)*100+cms_currentProgress))/cms_module_count;
-	else
-	  cms_overallProgress = cms_currentProgress;
-	m_updateSig.activate();	
-}
-
-/** This function sets the modules which should be searched. */
-void CSwordModuleSearch::setModules( ListCSwordModuleInfo list ) {
-	m_moduleList = list;
-}
-
-/** Starts the search for the search text. */
-const bool CSwordModuleSearch::startSearch() {
-	backend()->setFilterOptions ( CBTConfig::getFilterOptionDefaults() );	
-	m_foundItems			= false;
-	m_terminateSearch = false;
-	m_isSearching 		= true;		
-		
-	cms_currentProgress = 0;
-	cms_overallProgress = 0;
-	cms_module_current = 0;
-	cms_module_count = m_moduleList.count();
-	
-	bool foundItems = false;
-	
-	for (m_moduleList.first(); m_moduleList.current() && !m_terminateSearch; m_moduleList.next()) {
-		cms_module_current++;
-		if ( m_moduleList.current()->search(m_searchedText, m_searchOptions, m_searchScope, &percentUpdateDummy) )
-			foundItems = true;
-	}
-	cms_currentProgress = 100;
-	cms_overallProgress = 100;
-	
-	m_foundItems = foundItems;		
-	m_isSearching = false;
-	m_terminateSearch = false;
-
-  m_finishedSig.activate();		
-	return true;
-}
-
-void CSwordModuleSearch::startSearchThread(void){
-	startSearch();
-}
-
-/** Sets the text which should be search in the modules. */
-void CSwordModuleSearch::setSearchedText( const QString text ){
-	m_searchedText = text;
-}
-
-/** Sets the search scope. */
-void CSwordModuleSearch::setSearchScope( sword::ListKey scope ) {
-  m_searchScope.copyFrom( scope );
-  if (!strlen(scope.getRangeText())) { //we can't search with an empty search scope, would crash
-    //reset the scope
-    resetSearchScope();
-    
-    //disable searching with a scope!
-    if (m_searchOptions | useScope) {
-//      qWarning("using the scope!");
-      //set back the scope flag
-    }
-  }
-}
-
-/** Sets the search scope back. */
-void CSwordModuleSearch::resetSearchScope() {
-	m_searchScope.ClearList();
-}
-
-/** Interrupts the current search. */
-void CSwordModuleSearch::interruptSearch() {
-	if (m_isSearching)
-		m_terminateSearch = true; //no other modules will be searched
-	for (m_moduleList.first(); m_moduleList.current(); m_moduleList.next())
-		m_moduleList.current()->interruptSearch(); //interrupt the current module
-}
-
-/** Returns true if in the last search the searcher found items, if no items were found return false. */
-const bool CSwordModuleSearch::foundItems() {
-	return m_foundItems;
-}
-
-/** Sets the options for this search. Options include theflags and search types of the Sword searc interface. */
-void CSwordModuleSearch::setSearchOptions( int options ){
-	m_searchOptions = options;
-}
-
-/** Returns the percent for the given type. */
-const int CSwordModuleSearch::getPercent( percentType type ){
-	switch (type) {
-		case currentModule:
-			return cms_currentProgress;
-		case allModules:
-			return cms_overallProgress;
-//		default:
-//			return 0;
-	};
-	return 0;
-}
-
-/** Returns a copy of the used search scope. */
-sword::ListKey& CSwordModuleSearch::scope() {
-	return m_searchScope;
-}
-
-void CSwordModuleSearch::connectPercentUpdate( QObject *receiver, const char *member ) {
-	m_updateSig.connect(receiver, member);
-};
-
-void CSwordModuleSearch::connectFinished( QObject *receiver, const char *member ) {
-	m_finishedSig.connect(receiver, member);
-};
-
-/** Should be called when the search finished. */
-void CSwordModuleSearch::searchFinished(){
-	m_finishedSig.activate();	
-}
diff --git a/bibletime/backend/cswordmodulesearch.h b/bibletime/backend/cswordmodulesearch.h
deleted file mode 100644
index 86d6a8b..0000000
--- a/bibletime/backend/cswordmodulesearch.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/***************************************************************************
-                          cswordmodulesearch.h  -  description
-                             -------------------
-    begin                : Fri Oct 13 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDMODULESEARCH_H
-#define CSWORDMODULESEARCH_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qsignal.h>
-
-//System includes
-#include <pthread.h>
-
-//Sword includes
-#include <listkey.h>
-
-//class ListKey;
-class CSwordModuleInfo;
-typedef QPtrList<CSwordModuleInfo> ListCSwordModuleInfo;
-
-/**
-	* CSwordModuleSearch manages the search on Sword modules. It manages the thread(s)
-	* and manages the different modules.
-  *
-  * @author The BibleTime team
-  * @version $Id: cswordmodulesearch.h,v 1.17 2004/01/27 15:38:16 joachim Exp $
-  */
-class CSwordModuleSearch: public CPointers {
-public:
-	enum scopeType {
-		Scope_NoScope,
-		Scope_LastSearch,
-		Scope_Bounds
-	};
-  enum searchOptions {
-  	exactPhrase		= 0x000000001,
-  	multipleWords	= 0x000000002,
-  	regExp				= 0x000000004,
-  	caseSensitive	= 0x000000008,  	
-  	useLastResult	= 0x000000010,
-  	useScope	 		= 0x000000020
-	};
-	enum percentType {
-  	currentModule,
-		allModules
-	};
-  /**
-  * This is used to show the selection in the searchscope dialog
-  */
-  enum SearchScope 		{ NoScope, LastSearch, Bounds	};
-
-  /** This is used to so show the selection of the searchdialog
-  *
-  */
-  enum SearchType 		{ MultiWord, ExactPhrase, RegEx	};
-
-
-	CSwordModuleSearch();
-	/**
-	* The destructor of this class. It cleans uop memory before it's deleted.
-	*/
-	virtual ~CSwordModuleSearch();
-  /**
- 	* Sets the text which should be search in the modules.
- 	*/
-  void setSearchedText( const QString );
-  /**
- 	* Starts the search for the search text.
- 	*/
-  const bool startSearch();
-  /**
- 	* This function sets the modules which should be searched.
- 	*/
-  void setModules( ListCSwordModuleInfo );
-  /**
- 	* Sets the search scope.
- 	*/
-  void setSearchScope( sword::ListKey scope );
-  /**
- 	*	Calls with true if you want to use the last searchresult as search scope.
- 	*/
-//  void useLastSearchResult( const bool );
-  /**
- 	* Sets the seaech scope back.
- 	*/
-  void resetSearchScope();
-  /**
- 	* Interrupts the current search.
- 	*/
-  void interruptSearch();
-  /**
- 	* @return "true" if in the last search the searcher found items, if no items were found return "false"
- 	*/
-  const bool foundItems();
-  /**
- 	* This functions starts the search: First it creates a new thread for the search and it calles the the
- 	* function to start the search.
- 	*/
-	void startSearchThread(void);
-  /**
- 	* Sets the options for this search. Options include the
-	* flags and search types of the Sword searc interface.
-	*/
-  void setSearchOptions( int options );
-  /**
- 	* Returns the percent for the given type.
- 	*/
-  const int getPercent( percentType type );
-	void percentUpdate(char percent, void *p);
-  /**
-  * Returns a copy of the used search scope.
-  */
-  sword::ListKey& scope();
-	void connectPercentUpdate( QObject *receiver, const char *member );
-	void connectFinished( QObject *receiver, const char *member );
-  void searchFinished();
-		
-protected:
-	QString m_searchedText;
-	sword::ListKey m_searchScope;
-	ListCSwordModuleInfo m_moduleList;
-
-	int m_searchOptions;
-
-	bool m_foundItems;
-	bool m_isSearching;
-	bool m_terminateSearch;
-
-	int cms_currentProgress;
-	int cms_overallProgress;
-	int cms_module_count;
-	int cms_module_current;
-
-private:
-	QSignal m_updateSig;
-	QSignal m_finishedSig;
-};
-
-#endif
diff --git a/bibletime/backend/cswordtreekey.cpp b/bibletime/backend/cswordtreekey.cpp
deleted file mode 100644
index c9444aa..0000000
--- a/bibletime/backend/cswordtreekey.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
-                          cswordtreekeyidx.cpp  -  description
-                             -------------------
-    begin                : Thu Jan 24 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cswordtreekey.h"
-#include "cswordbookmoduleinfo.h"
-
-CSwordTreeKey::CSwordTreeKey( const CSwordTreeKey& k ) : CSwordKey(k), TreeKeyIdx(k) {
-  
-}
-
-CSwordTreeKey::CSwordTreeKey( const TreeKeyIdx *k, CSwordModuleInfo* module ) : CSwordKey(module), TreeKeyIdx(*k) {
-  
-}
-
-CSwordTreeKey* CSwordTreeKey::copy() const {
-	return new CSwordTreeKey(*this);
-}
-
-/** Sets the key of this instance */
-const QString CSwordTreeKey::key( ){
-  return QString::fromLocal8Bit( getFullName() ); //don't use fromUtf8
-}
-
-void CSwordTreeKey::key( const QString& newKey ){
-  if (newKey.isEmpty()) {
-    root();
-  }
-  else
-    TreeKeyIdx::operator = ((const char*)newKey.local8Bit());		//don't use Utf8! Doesn't work with umlauts!	
- 	
-  if (Error())
- 		root();
-}
-
-void CSwordTreeKey::key( const char* newKey ){
-	if (newKey) {
-		TreeKeyIdx::operator = (newKey);
-	}
-}
-
-CSwordModuleInfo* const CSwordTreeKey::module( CSwordModuleInfo* const newModule ) {
-	if (newModule && (newModule != m_module) && (newModule->type() == CSwordModuleInfo::GenericBook) ) {
-		m_module = newModule;
-
-		const QString oldKey = key();
-		CSwordBookModuleInfo* newBook = dynamic_cast<CSwordBookModuleInfo*>(newModule);
-		copyFrom(*(newBook->tree()));
-
-		key(oldKey); //try to restore our old key
-	}
-	return m_module;
-}
-
-/** Assignment operator. */
-CSwordTreeKey& CSwordTreeKey::operator = (const QString& keyname ){
-  key(keyname);
-  return *this;
-}
diff --git a/bibletime/backend/cswordtreekey.h b/bibletime/backend/cswordtreekey.h
deleted file mode 100644
index 98c78e3..0000000
--- a/bibletime/backend/cswordtreekey.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************
-                          cswordtreekeyidx.h  -  description
-                             -------------------
-    begin                : Thu Jan 24 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDTREEKEYIDX_H
-#define CSWORDTREEKEYIDX_H
-
-//BibleTime includes
-#include "cswordkey.h"
-#include "cswordmoduleinfo.h"
-
-//Sword includes
-#include <treekeyidx.h>
-
-/** BibleTime's implementation of Sword's TreeKeyIdx class.
-  * @author The BibleTime team
-  */
-class CSwordTreeKey : public CSwordKey, public sword::TreeKeyIdx  {
-public:
-	CSwordTreeKey( const CSwordTreeKey& k );
-	CSwordTreeKey( const sword::TreeKeyIdx *k, CSwordModuleInfo* module );
-	CSwordModuleInfo* const module( CSwordModuleInfo* const newModule );
-	virtual CSwordTreeKey* copy() const;
-  /**
-  * Returns the current key
-  */
-  virtual const QString key( );
-  /**
-  * Set the key. If the parameter is empty or null, the key will be set to "/"
-  */
-  virtual void key( const QString& key );
-  /**
-  * Set/get the key. If the parameter is not set (means equal to QString::null)
-  * the used key is returned. Otherwise the key is set and the new on ei returned.
-  */
-	virtual void key( const char* key );
-  /**
-  * Assignment operator.
-  */
-  virtual CSwordTreeKey& operator = (const QString& keyname );
-};
-
-#endif
diff --git a/bibletime/backend/cswordversekey.cpp b/bibletime/backend/cswordversekey.cpp
deleted file mode 100644
index cebf311..0000000
--- a/bibletime/backend/cswordversekey.cpp
+++ /dev/null
@@ -1,257 +0,0 @@
-/***************************************************************************
-                          cswordversekey.cpp  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cswordversekey.h"
-#include "cswordbiblemoduleinfo.h"
-#include "cswordcommentarymoduleinfo.h"
-
-//Qt includes
-#include <qstringlist.h>
-
-//Sword includes
-#include <swmodule.h>
-
-CSwordVerseKey::CSwordVerseKey( CSwordModuleInfo* module ) : CSwordKey(module) {
-  if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module) ) {
-    key( bible->lowerBound().key() );
-  }
-}
-
-CSwordVerseKey::CSwordVerseKey( const CSwordVerseKey& k ) : CSwordKey(k), VerseKey(k) {
-
-}
-
-CSwordVerseKey::CSwordVerseKey( const VerseKey* k, CSwordModuleInfo* module) : CSwordKey(module), VerseKey(*k) {
-}
-
-/** Clones this object. */
-CSwordKey* CSwordVerseKey::copy() const {
-	return new CSwordVerseKey(*this);
-}
-
-/** Sets the module for this key */
-CSwordModuleInfo* const CSwordVerseKey::module( CSwordModuleInfo* const newModule ){
-	if (newModule && ( (newModule->type() == CSwordModuleInfo::Bible) || (newModule->type() == CSwordModuleInfo::Commentary) )) {
-	//	const QString& oldKey	= key();
-		m_module = newModule;
-	//	key(oldKey);
-
-		//check if the module contains the key we present
-		CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(newModule);
-   	if (_compare(bible->lowerBound()) < 0) {
-			qWarning("setting key to lower bound %s", bible->lowerBound().key().latin1());
-      key( bible->lowerBound() );
-    }
-    if (_compare(bible->upperBound()) > 0) {
-			qWarning("setting key to upper bound %s", bible->upperBound().key().latin1());
-      key( bible->upperBound() );
-    }
-	}
-	return dynamic_cast<CSwordBibleModuleInfo*>(m_module);
-}
-
-/** Returns the current book as Text, not as integer. */
-const QString CSwordVerseKey::book( const QString& newBook ) {
-	int min = 0;
-	int max = 1;
-	
-	if (CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module())) {
-		const bool hasOT = bible->hasTestament(CSwordBibleModuleInfo::OldTestament);		
-		const bool hasNT = bible->hasTestament(CSwordBibleModuleInfo::NewTestament);
-		if (hasOT && hasNT) {
-			min = 0;
-			max = 1;
-		}
-		else if (hasOT && !hasNT) {
-			min = 0;
-			max = 0;
-		}
-		else if (!hasOT && hasNT) {
-			min = 1;
-			max = 1;
-		}
-		else if (!hasOT && !hasNT) {
-			min = 0;
-			max = -1; //no loop
-		}
-  }
-
-	if (!newBook.isEmpty()) {
-		bool finished = false;
-		for (int testament = min; testament <= max && !finished; ++testament) {
-			for (int book = 0; book < BMAX[testament] && !finished; ++book) {
-				if ( !strcmp((const char*)newBook.local8Bit(),books[testament][book].name ) ) {
-					Testament(testament+1);
-					Book(book+1);
-					finished = true;
-				}
-			}
-		}
-	}
-	if ( Testament() >= min+1 && Testament() <= max+1 && Book() <= BMAX[min] )
-		return QString::fromLocal8Bit( books[Testament()-1][Book()-1].name );
-	return QString::fromLocal8Bit( books[min][0].name ); //return the first book, i.e. Genesis
-}
-
-/** Sets the key we use to the parameter. */
-const QString CSwordVerseKey::key(){	
-	return QString::fromLocal8Bit(getText()); //don't use fromUtf8 here!
-//	return QString::fromLocal8Bit((const char*)*this); //don't use fromUtf8 here!
-}
-
-void CSwordVerseKey::key( const QString& newKey ) {
-	if (newKey.isEmpty()) {
-    if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module()) ) {
-      VerseKey::operator = ((const char*)bible->lowerBound().key().local8Bit());
-    }
-  }
-  else {
-    VerseKey::operator = ((const char*)newKey.local8Bit());
-  }
-}
-
-void CSwordVerseKey::key( const char* newKey ){
-  if (newKey && strlen(newKey)>0) {
-		VerseKey::operator = (newKey);
-	}
-  else if (!strlen(newKey)) {
-    if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module()) ) {
-      VerseKey::operator = ((const char*)bible->lowerBound().key().local8Bit());
-    }
-  }
-}
-
-const bool CSwordVerseKey::next( const JumpType type ) {
-	//clear Error status
-	Error();
-
-	switch (type) {
-		case UseBook: {
-			if ((Book() <= 0) || (Book() >= BMAX[Testament()-1]) && (Testament() > 1)) {
-				return false;
-			}
-			Book(Book()+1);
-			break;
-		}
-		case UseChapter: {
-			Chapter(Chapter()+1);
-			break;
-		}
-		case UseVerse: {
-    	if (m_module && m_module->module()) {
-				//qWarning("module is %s", m_module->name().latin1());
-    		m_module->module()->SetKey(this);	//use this key as base for the next one!
-        m_module->module()->setSkipConsecutiveLinks(true);
-    		(*(m_module->module()) )++;
-        m_module->module()->setSkipConsecutiveLinks(false);
-
-    		if (!m_module->module()->Error()) {
-    			key( QString::fromLocal8Bit(m_module->module()->KeyText()) );//don't use fromUtf8
-        }
-    		else {
-					qWarning("VerseKey::next: module error");
-	    	  Verse(Verse()+1);
-	    	  break;
-	    	}
-    	}
-    	else {
-    	  Verse(Verse()+1);
-      }
-    	break;
-		}
-		default:
-			return false;
-	};
-
-  if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module()) ) {
-    bool ret = true;
-    if (Error()) {
-      ret = false;
-		}
-		//check if the key if out of the modules bounds
-    else if (_compare(bible->lowerBound()) < 0) {
-      key( bible->lowerBound() );
-      ret = false;
-    }
-    if (_compare(bible->upperBound()) > 0) {
-      key( bible->upperBound() );
-      ret = false;
-    }
-    return ret;
-  }
-  else if (Error()) { //we have no module, so take care of VerseKey::Error()
-    return false;
-	}
-
-  return true;
-};
-
-const bool CSwordVerseKey::previous( const JumpType type ) {
-	switch (type) {
-		case UseBook: {
-			if (Book()<=1 || Book() > BMAX[Testament()-1] && Testament() > 1)
-				return false;
-			Book(Book()-1);
-			break;
-		}
-		case UseChapter: {
-			Chapter(Chapter()-1);
-			break;
-		}
-		case UseVerse: {
-    	if (m_module && m_module->module()) {
-    		m_module->module()->SetKey(this);	//use this key as base for the next one!
-        m_module->module()->setSkipConsecutiveLinks(true);
-    		( *( m_module->module() ) )--;
-        m_module->module()->setSkipConsecutiveLinks(true);      
-    		if (!m_module->module()->Error())
-    			key( QString::fromLocal8Bit(m_module->module()->KeyText()) );//don't use fromUtf8
-    		else
-	    	  Verse(Verse()-1);
-    	}
-    	else {
-    		Verse(Verse()-1);
-      }
-      break;
-		}
-		default:	
-			return false;
-	};
-
-  if ( CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module()) ) {
-    bool ret = true;
-    if (_compare(bible->lowerBound()) < 0 ) {
-      key( bible->lowerBound() );
-      ret = false;
-    }
-    if (_compare(bible->upperBound()) > 0 ) {
-      key( bible->upperBound() );
-      ret = false;
-    }
-    return ret;
-  }
-  else if (Error())
-    return false;
-  return true;
-};
-
-/** Assignment operator for more ease of use. */
-CSwordVerseKey& CSwordVerseKey::operator = (const QString& keyname){
-  key(keyname);
-  return *this;
-}
diff --git a/bibletime/backend/cswordversekey.h b/bibletime/backend/cswordversekey.h
deleted file mode 100644
index 18a30d4..0000000
--- a/bibletime/backend/cswordversekey.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/***************************************************************************
-                          cswordversekey.h  -  description
-                             -------------------
-    begin                : Thu Oct 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************
-
- ***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDVERSEKEY_H
-#define CSWORDVERSEKEY_H
-
-//own includes
-#include "cswordkey.h"
-#include "cswordmoduleinfo.h"
-
-//Qt includes
-#include <qstring.h>
-
-//Sword includes
-#include <versekey.h>
-
-/**
-	* The CKey implementation for verse based modules (Bibles and Commentaries)
-	*
-	*	This class is the implementation of CKey for verse based modules like
-	*	Bibles and commentaries.
-	* This class provides the special functions to work with the verse based modules.
-	*
-	* Useful functions are
-	*	@see NextBook()
-	* @see PreviousBook()
-	* @see NextChapter()
-	* @see PreviousChapter()
-	* @see NextVerse()
-	* @see PreviousVerse().
-	*
-	* Call the constructor only with a valid verse based modules, otherwise this key will be invalid
-	* and the application will probably crash.
-	*
-	*	@version $Id: cswordversekey.h,v 1.15 2003/07/05 17:12:16 joachim Exp $
-  *	@author The BibleTime team
-  */
-class CSwordVerseKey : public CSwordKey,  public sword::VerseKey  {
-public:
-	enum JumpType {
-		UseBook,
-		UseChapter,
-		UseVerse
-	};
-
-	/**
-	* Constructor of this class.
-	*
-	* This function will construct a versekey with the current module position
-	* and it will setup the m_module members.
-	*
-	*/
-	CSwordVerseKey( CSwordModuleInfo* module );
-  /**
-  * Copy constructor.
-  */
-  CSwordVerseKey( const CSwordVerseKey& k );
-  /**
-  * VerseKey based constructor.
-  */
-  CSwordVerseKey( const sword::VerseKey* k, CSwordModuleInfo* module );
-  /**
-  * Clones this object.
-  */
-  virtual CSwordKey* copy() const;
-  /**
-  * Set/get the key. If the parameter is not set (means equal to QString::null)
-  * the used key is returned. Otherwise the key is set and the new on ei returned.
-  */
-  virtual const QString key();
-  /**
-  * Set the current key.
-  */
-  virtual void key( const QString& );
-  /**
-  * Set/get the key. If the parameter is not set (means equal to QString::null)
-  * the used key is returned. Otherwise the key is set and the new on ei returned.
-  */
-	virtual void key( const char* key );
-	
-	/**
-	* Jumps to the next entry of the given type
-	*/
-	const bool next( const JumpType type );
-	/**
-	* Jumps to the previous entry of the given type
-	*/
-	const bool previous ( const JumpType type );	
-  /**
-  * This functions returns the current book as localised text, not as book numer.
-  *
-  * Use "char Book()" to retrieve the book number of the current book.
-  * @return The name of the current book
-  */
-  const QString book(const QString& newBook = QString::null);
-  /**
-  * Sets the module for this key
-  */
-  virtual CSwordModuleInfo* const module( CSwordModuleInfo* const newModule = 0 );
-  /**
-	* Assignment operator for more ease of use.
-	*/
-  virtual CSwordVerseKey& operator = (const QString& keyname);
-};
-
-#endif
diff --git a/bibletime/bibletime.cpp b/bibletime/bibletime.cpp
deleted file mode 100644
index f3c94ba..0000000
--- a/bibletime/bibletime.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-/***************************************************************************
-                          bibletime.cpp  -  The main class of BibleTime
-                             -------------------
-    begin                : Mit Jan 19 12:57:15 CET 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//local includes
-#include "config.h"
-#include "bibletime.h"
-
-//frontend includes
-#include "frontend/cmdiarea.h"
-#include "frontend/kstartuplogo.h"
-#include "frontend/mainindex/cmainindex.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/creadwindow.h"
-#include "frontend/displaywindow/cwritewindow.h"
-#include "frontend/keychooser/ckeychooser.h"
-#include "frontend/cbtconfig.h"
-
-#include "util/ctoolclass.h"
-#include "util/cpointers.h"
-
-//backend includes
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbiblemoduleinfo.h"
-#include "backend/cswordcommentarymoduleinfo.h"
-#include "backend/cswordlexiconmoduleinfo.h"
-#include "backend/cswordbookmoduleinfo.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordldkey.h"
-
-//printing includes
-#include "printing/cprinter.h"
-
-//Qt includes
-#include <qsplitter.h>
-
-//KDE includes
-#include <kaction.h>
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kcmdlineargs.h>
-#include <klocale.h>
-#include <kaccel.h>
-#include <kmenubar.h>
-#include <ktoolbar.h>
-#include <krandomsequence.h>
-
-BibleTime::BibleTime()
-  : KMainWindow(0,0, WType_TopLevel /*| WDestructiveClose*/),
-	  m_initialized(false),
-	  m_moduleList(0),
-	  m_progress(0),
-	  m_currentProfile(0),
-    m_splitter(0),
-    m_mdi(0),
-    m_profileMgr(),
-    m_backend(0),
-    m_printer(0),
-    m_mainIndex(0)
-{
-	setHelpMenuEnabled(false);
-
-  initBackends();
-	initPrinter();
-	initView();
-	initActions();
-
-	createGUI("bibletimeui.rc");
-	initMenubar();
-	initConnections();
-
-	readSettings();
-
-	setPlainCaption("BibleTime " VERSION);
-
-  // we don't save the geometry, it's stored in the startup profile
-  setAutoSaveSettings(QString::fromLatin1("MainWindow"), true);
-}
-
-/** Saves the properties of BibleTime to the application wide configfile  */
-void BibleTime::saveSettings(){
-	if (m_mdi) {
-		m_mdi->saveSettings();
-  }
-
-  accel()->writeSettings();
-
- 	CBTConfig::set(CBTConfig::toolbar, m_viewToolbar_action->isChecked());
- 	CBTConfig::set(CBTConfig::mainIndex, m_viewMainIndex_action->isChecked());
-
- 	if (m_viewMainIndex_action->isChecked()) {	//only save changes when the groupmanager is visible
- 		CBTConfig::set(CBTConfig::splitterSizes, m_splitter->sizes());
-  }
-
- 	if (m_windowAutoTile_action->isChecked())	{
- 		CBTConfig::set(CBTConfig::autoTile, true);
- 		CBTConfig::set(CBTConfig::autoCascade, false);
- 	}
- 	else if ( m_windowAutoTile_action->isChecked() ) {
-		CBTConfig::set(CBTConfig::autoTile, false);
- 		CBTConfig::set(CBTConfig::autoCascade, true);	
- 	}
- 	else {
-		CBTConfig::set(CBTConfig::autoTile, false);
- 		CBTConfig::set(CBTConfig::autoCascade, false);	
- 	}
-
-	if ( CBTConfig::get(CBTConfig::restoreWorkspace) ) {
-		if (CProfile* p = m_profileMgr.startupProfile()) {
-			saveProfile(p);
-    }
-	}
-}
-
-/** Reads the settings from the configfile and sets the right properties. */
-void BibleTime::readSettings(){
-	accel()->readSettings(KGlobal::config());
-
- 	m_viewToolbar_action->setChecked( CBTConfig::get(CBTConfig::toolbar) );
- 	slotToggleToolbar();
-		
- 	m_viewMainIndex_action->setChecked( CBTConfig::get(CBTConfig::mainIndex) );
- 	slotToggleGroupManager();
-		
- 	m_splitter->setSizes( CBTConfig::get(CBTConfig::splitterSizes) );		
-
- 	if ( CBTConfig::get(CBTConfig::autoTile) ) {
- 		m_windowAutoTile_action->setChecked( true );
- 		m_windowAutoCascade_action->setChecked( false );
- 		m_mdi->setGUIOption( CMDIArea::autoTile );
- 	}
- 	else if ( CBTConfig::get(CBTConfig::autoCascade) ) {
- 		m_windowAutoCascade_action->setChecked(true);
- 		m_windowAutoTile_action->setChecked(false);
- 		m_mdi->setGUIOption( CMDIArea::autoCascade );
- 	}
- 	else {
- 		m_mdi->setGUIOption( CMDIArea::Nothing );		
- 		m_windowAutoTile_action->setChecked(false);
- 		m_windowAutoCascade_action->setChecked(false);		
- 	}
-}
-
-/** Creates a new presenter in the MDI area according to the type of the module. */
-CDisplayWindow* BibleTime::createReadDisplayWindow(ListCSwordModuleInfo modules, const QString& key) {
-  kapp->setOverrideCursor( waitCursor );
-
-//  qWarning("will create now displayWindow (bibletime)");
-  CDisplayWindow* displayWindow = CDisplayWindow::createReadInstance(modules, m_mdi);
-//  qWarning("created displayWindow (bibletime)");
-  if ( displayWindow ) {
-  	displayWindow->init(key);
-		displayWindow->show();
-	}
-
-  kapp->restoreOverrideCursor();  
-	return displayWindow;
-}
-
-
-/** Creates a new presenter in the MDI area according to the type of the module. */
-CDisplayWindow* BibleTime::createReadDisplayWindow(CSwordModuleInfo* module, const QString& key) {
-	ListCSwordModuleInfo list;
-	list.append(module);
-
-	return createReadDisplayWindow(list, key);
-}
-
-CDisplayWindow* BibleTime::createWriteDisplayWindow(CSwordModuleInfo* module, const QString& key, const CDisplayWindow::WriteWindowType& type) {
-  kapp->setOverrideCursor( waitCursor );
-
-	ListCSwordModuleInfo modules;
-	modules.append(module);
-
-  CDisplayWindow* displayWindow = CDisplayWindow::createWriteInstance(modules, m_mdi, type);
-  if ( displayWindow ) {
-  	displayWindow->init(key);
-		displayWindow->show();
-	}
-
-  kapp->restoreOverrideCursor();
-	return displayWindow;
-}
-
-/** Refreshes all presenters.*/
-void BibleTime::refreshDisplayWindows() {
-	unsigned int index;				
-	for ( index = 0; index < m_mdi->windowList().count(); index++) {
-		if (CDisplayWindow* window = dynamic_cast<CDisplayWindow*>(m_mdi->windowList().at(index))) {
-   		window->reload();
-    }
-	}
-}
-
-/** Called before quit. */
-bool BibleTime::queryExit(){
-  if (!m_initialized) {
-  	return false;
-  }
-	saveSettings();
-	return true;
-}
-
-/** Called before a window is closed */
-bool BibleTime::queryClose(){
-  bool ret = true;
-	for ( unsigned int index = 0; index < m_mdi->windowList().count(); ++index) {
-		if (CDisplayWindow* window = dynamic_cast<CDisplayWindow*>(m_mdi->windowList().at(index))) {
-   		ret = ret && window->queryClose();
-    }
-	}	
-	return ret;
-}
-
-/** Reimplementation used for sessions management. */
-void BibleTime::saveProperties(KConfig* /*myConfig*/){
-
-}
-
-/** Reimplementation used for session management. */
-void BibleTime::readProperties(KConfig* /*myConfig*/){
-
-}
-
-/** Restores the workspace if the flag for this is set in the config. */
-void BibleTime::restoreWorkspace(){	
-	if (CProfile* p = m_profileMgr.startupProfile()) {
-		loadProfile(p);
-  }
-}
-
-/** Sets the caption of the mainwindow */
-void BibleTime::setCaption( const QString& ){
-	KMainWindow::setPlainCaption( KApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
-}
-
-/** Sets the plain caption of the main window */
-void BibleTime::setPlainCaption( const QString& ){
-	KMainWindow::setPlainCaption( KApplication::kApplication()->makeStdCaption( m_mdi->currentApplicationCaption() ) );
-}
-
-/** Processes the commandline options given to BibleTime. */
-void BibleTime::processCommandline(){
-  KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-  if (CBTConfig::get(CBTConfig::crashedLastTime) || CBTConfig::get(CBTConfig::restoreWorkspace)) {
-    if (!CBTConfig::get(CBTConfig::crashedTwoTimes) && !args->isSet("ignore-session")) { //restore workspace if it crashed only once
-      restoreWorkspace();
-    }
-  }
-
-  //open every time a module if the command line option was set.
-  if ( args->isSet("open-default-bible") && !CBTConfig::get(CBTConfig::crashedLastTime) && !CBTConfig::get(CBTConfig::crashedTwoTimes)) { //restore workspace if it crashed ony once
-    QString bibleKey = args->getOption("open-default-bible");    
-    CSwordModuleInfo* bible = CPointers::backend()->findModuleByDescription(CBTConfig::get(CBTConfig::standardBible));
-    if (bibleKey == "<random>") {
-      CSwordVerseKey vk(0);
-      const int maxIndex = 32400;
-
-      KRandomSequence rs;
-      int newIndex = rs.getLong(maxIndex);
-      vk.setPosition(sword::TOP);
-      vk.Index(newIndex);
-      bibleKey = vk.key();
-    }
-    createReadDisplayWindow(bible, bibleKey);
-//    if (isVisible())
-      m_mdi->myTile();//we are sure only one window is open, which should be displayed fullscreen in the working area
-  }
-}
-
-void BibleTime::polish(){
-  m_initialized = true;
-  KMainWindow::polish();
-  applyMainWindowSettings(KGlobal::config(), QString::fromLatin1("MainWindow"));
-}
-
diff --git a/bibletime/bibletime.h b/bibletime/bibletime.h
deleted file mode 100644
index d22e5f5..0000000
--- a/bibletime/bibletime.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/***************************************************************************
-                          bibletime.h  -  description
-                             -------------------
-    begin                : Mit Jan 19 12:57:15 CET 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
-***************************************************************************/
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef BIBLETIME_H
-#define BIBLETIME_H
-
-//KDE includes
-#include <kmainwindow.h>
-
-//Frontend includes
-#include "frontend/cprofilemgr.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-
-//Backend includes
-#include "backend/cswordmoduleinfo.h"
-
-//forward class declarations
-
-//BT classes
-class CMDIArea;
-class CProfile;
-class CDisplayWindow;
-class CMainIndex;
-
-//KDE classes
-class KToggleAction;
-class KAccel;
-class KPopupMenu;
-class KAction;
-class KActionMenu;
-
-//QT classes
-class QPopupMenu;
-class QProgressDialog;
-class QSplitter;
-
-/**
- 	*	@page backend The structure of the backend
- 	*
- 	*	The backend implementation for Sword is called CSwordBackend, the classes we use
- 	* to work with keys are called CSwordVerseKey and CSwordLDKey, both are derived from
- 	* the class CSwordKey.
- 	* The CSwordKey derived classes used for Sword do also inherit the classes VerseKey (CSwordVerseKey)
- 	*	and SWKey (CSwordLDKey).
- 	*	
- 	*	The classes used to handle all module based stuff are derived from CModuleInfo.
- 	*	The module classes are: CSwordModuleInfo (for Sword modules), CSwordBibleModuleInfo (for bibles), CSwordCommentaryModuleInfo (for commentaries) and
- 	*	CSwordLexiconModuleInfo (for lexicons).
- 	*	Have a look at the class documentation of the mentioned classes to learn how the
- 	*	structure of them looks like and which class inherits which other class.
- 	*
- 	*	The first objects which should be created in the application is the backend (for Sword the class is called CSwordBackend).
- 	*	Then create all the different module classes for the correct Sword modules. Have a look at
- 	* BibleTime::initBackens() to see how it's done in BibleTime.@br
- 	*	Later you can work with them for example by using the CSwordKey and CSwordModuleInfo derived class.
- 	*/
-
-/**
- 	*	@page frontend The structure of the frontend
- 	*	
- 	*
- 	*	The frontend contains the classes which interact with the user. For example the main index,
- 	* the display windows, the searchdialog or the other parts.
- 	* The main index is implemented in the class CGroupManager, the items of the main index are implemented in the class CGroupManagerItem.
- 	* Each CGroupManagerItem has a type() function which returns the type of the object (Module, Bookmark or Group).<BR>
- 	* The display windows are all derived from the base class CPresenter. The display windows which handle Sword modules are all derived from the CSwordPresenter class.
- 	* The display windows which provide functionality are CBiblePresenter for Bibles, CCommentaryPresenter for commentaries and CLexiconPresenter for lexicon and dictionaries.
- 	* CSwordPresenter provides the essential base functions which are reimplemented in the derived classes (for example CSwordPresenter::lookup).<BR>
- 	* Another important part of the frontend are the keychoosers. They provide an interface to choose a key of a module. The interface for different module types is different.
- 	* The base class is CKeyChooser which is the factory for the derived classes. Use the function CKeyChooser::createInstance to get the correct
- 	* keychooser implementation for the desired module.<BR>
- 	*/
-
-/** @mainpage BibleTime - sourcecode documentation
- *
- *	This is the sourcecode documentation of BibleTime, a Bible study tool for KDE/Linux.
- *	BibleTime is devided in two major parts, the backend and the frontend.<BR>
- *	Documentation for the backend: @ref backend<BR>
- *	Documentation for the frontend: @ref frontend.<BR>
- */
-
-/** The main class of BibleTime. Here are the main widgets created.
-	*
-	* This is the main class of BibleTime! This class creates the GUI, the KAction objects
-	* and connects to some slots. Please insert the creation of actions in initActions,
-	* the creation of widgets into initView and the connect(...) calls into initConnections.
-	* Reading from a config file on creation time should go into readSettings(), saving into
-	* saveSettings().
-	* This is the general way of all BibleTime classes.
-	*/
-class BibleTime : public KMainWindow {
-	friend class CMDIArea;
-	Q_OBJECT
-public:
-	/**
-	* construtor of BibleTime
-	*/
-	BibleTime();
-	
-  virtual void polish();
-  /**
-	* Reads the settings from the configfile and sets the right properties.
-	*/
-	void readSettings();
-	/**
-	* Saves the settings of this class
-	*/
-	void saveSettings();
-	/**
-	* Restores the workspace if the flaf for this is set in the config.
-	*/
-	void restoreWorkspace();
-	/**
-	* Apply the settings given by the profile p
-	*/
-	void applyProfileSettings( CProfile* p );
-	/**
-	* Stores the settings of the mainwindow in the profile p
-	*/
-	void storeProfileSettings( CProfile* p );
-
-public slots:
-	/**
-	* Shows the daily tip
-	*/
-	void slotHelpTipOfDay();
-	/**
-	* Opens the optionsdialog of BibleTime.
-	*/
-	void slotSettingsOptions();
-	/**
-	* Opens the optionsdialog of BibleTime.
-	*/
-	void slotSwordSetupDialog();
-	/**
-	* Opens the handbook.
-	*/
-	void openOnlineHelp_Handbook();
-	/**
-	* Opens the bible study howto.
-	*/
-	void openOnlineHelp_Howto();
-	/**
-	* Sets the plain caption of the main window
-	*/
-	virtual void setPlainCaption( const QString& );
-	/**
-	* Sets the caption of the mainwindow
-	*/
-	virtual void setCaption(const QString&);
-  /**
-  * Processes the commandline options given to BibleTime.
-  */
-  void processCommandline();
-
-protected: // Protected methods
-	/**
-	* Initializes the view of this widget
-	*/
-	void initView();
-	/**
-	* Initializes the menubar of BibleTime.
-	*/
-	void initMenubar();
-	/**
-	* Initializes the SIGNAL / SLOT connections
-	*/
-	void initConnections();
-	/**
-	* Initializes the backend
-	*/
-	void initBackends();
-	/**
-	* Initializes the action objects of the GUI
-	*/
-	void initActions();
-	/**
-	* Refreshes all presenter supporting at least in of the features given as parameter.
-	*/
-	void refreshDisplayWindows();
-	/**
-	* Called before a window is closed
-	*/
-	bool queryClose();
-	/**
-	* Called before quit.
-	*/
-	bool queryExit();
-	/**
-	* Initializes the CPrinter object.
-	*/
-	void initPrinter();
-	/**
-	* Reimplementation used for session management.
-	*/
-	void readProperties(KConfig* config);
-	/**
-	* Reimplementation used for sessions management.
-	*/
-	void saveProperties(KConfig* myConfig);	
-
-protected slots:
-	/**
- 	* Creates a new presenter in the MDI area according to the type of the module.
- 	*/
-	CDisplayWindow* createReadDisplayWindow(ListCSwordModuleInfo, const QString&);
-	CDisplayWindow* createReadDisplayWindow(CSwordModuleInfo*, const QString&);
-	CDisplayWindow* createWriteDisplayWindow(CSwordModuleInfo*, const QString&, const CDisplayWindow::WriteWindowType&);  
-	/** 	
- 	* Is called when the window menu is about to show ;-)
- 	*/
-	void slotWindowMenuAboutToShow();
-	/**
- 	* This slot is connected with the windowAutoTile_action object
- 	*/
-	void slotAutoTile();
-	/**
- 	* This slot is connected with the windowAutoCascade_action object
- 	*/
-	void slotAutoCascade();
-	/**
-	* Is called when a client was selected in the window menu
-	*/
-	void slotWindowMenuActivated( int );
-	/**
- 	* Shows/hides the toolbar
- 	*/
-	void slotToggleToolbar();
-	/**
-	* Opens a toolbar editor
-	*/
-	void slotSettingsToolbar();
-	/**
-	* Shows or hides the groupmanager.
-	*/
-	void slotToggleGroupManager();
-	/**
-	* Starts printing and opens the printerdialog at first.
-	*/
-	void slotFilePrint();
-	/**
- 	* Enables the "Clear printer queue" action
- 	*/
-	void slotSetPrintingStatus();
-	/**
-	* Saves to the profile with the menu id ID
-	*/
-	void saveProfile(int ID);
-	/**
-	* Saves the current settings into the currently activatred profile.
-	*/
-	void saveProfile(CProfile* p);
-	/**
-	* Saves the current settings into the currently activatred profile.
-	*/
-	void editProfiles();
-	/**
-	* Loads the profile with the menu id ID
-	*/
-	void loadProfile(int ID);
-	/**
-	* Loads the profile with the menu ID id
-	*/
-	void loadProfile(CProfile* p);
-	/**
-	* Toggles between normal and fullscreen mode.
-	*/
-	void toggleFullscreen();
-	/**
-	* Is called when settings in the optionsdialog have been
-	* changed (ok or apply)
-	*/
-	void slotSettingsChanged();
-	/**
-	* Is called when settings in the sword setup dialog have been
-	* changed (ok or apply)
-	*/
-	void slotSwordSetupChanged();
-	/**
-	 * Called when search button is pressed
-	 **/
-	void slotSearchModules();
-	/**
-	 * Called for search default bible
-	 **/
-	void slotSearchDefaultBible();
-	/**
-	 * Called when back button pressed
-	 **/
-//	void slotBack();
-	/**
-	 * Called when forward button pressed
-	 **/
-//	void slotForward();
-  /**
-   Saves current settings into a new profile.
-  */
-  void saveToNewProfile();
-  /**
-  * Slot to refresh the save profile and load profile menus.
-  */
-  void refreshProfileMenus();
-	
-
-private slots: // Private slots
-	/**
-	* No descriptions
-	*/
-	void slotPrintedPercent(const int index);
-	/**
-	* Printing was finished
-	*/
-	void slotPrintingFinished();
-	/**
-	* Aborts the printing
-	*/
-	void slotAbortPrinting();
-	/**
-	* Printing was started
-	*/
-	void slotPrintingStarted();
-
-private:
-  QPopupMenu* m_windowMenu;
-	QPopupMenu* m_editMenu;
-
-	/** FILE menu actions */
-	KAction* m_fileClearQueue_action;
-	KAction* m_filePrint_action;
-
-	/** VIEW menu actions */
-	KToggleAction*	m_viewToolbar_action;
-	KToggleAction*	m_viewMainIndex_action;
-
-	/** WINDOW menu actions */
-	KAction*	m_windowCascade_action;
-	KAction*	m_windowTile_action;
-	KToggleAction*	m_windowAutoCascade_action;
-	KToggleAction*	m_windowAutoTile_action;
-	KAction*	m_windowCloseAll_action;
-
-	KActionMenu*	m_windowSaveProfile_action;
- 	KAction*	m_windowSaveToNewProfile_action;
-	KActionMenu*	m_windowLoadProfile_action;
-	KAction*	m_windowEditProfiles_action;
-	KToggleAction*	m_windowFullscreen_action;
-
-	KHelpMenu* m_helpMenu;
-
-
-	bool m_initialized;
-	/**
-	* The list of installed SWORD modules
-	*/
-  ListCSwordModuleInfo* m_moduleList;
-	QProgressDialog* m_progress;
-
-  CProfile* m_currentProfile;
-	//KAccel* m_keyAccel;
-	QSplitter* m_splitter;
-	CMDIArea* m_mdi;
-
-	CProfileMgr m_profileMgr;
-	CSwordBackend* m_backend;
-	CPrinter* m_printer;
-
-	CMainIndex* m_mainIndex;
-
-
-};
-
-#endif
diff --git a/bibletime/bibletime_init.cpp b/bibletime/bibletime_init.cpp
deleted file mode 100644
index e0984d7..0000000
--- a/bibletime/bibletime_init.cpp
+++ /dev/null
@@ -1,532 +0,0 @@
-/***************************************************************************
-                          bibletime_init.cpp  -  functions to initialize BibleTime on startup
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "bibletime.h"
-
-#include "backend/cswordbackend.h"
-
-#include "frontend/mainindex/cmainindex.h"
-#include "frontend/cprofilemgr.h"
-#include "frontend/cprofile.h"
-#include "frontend/cmdiarea.h"
-#include "frontend/kstartuplogo.h"
-#include "frontend/cswordsetupdialog.h"
-
-#include "backend/clanguagemgr.h"
-
-#include "printing/cprinter.h"
-
-#include "config.h"
-#include "frontend/cbtconfig.h"
-
-#include "util/cpointers.h"
-#include "util/cresmgr.h"
-
-//system includes
-#include <stdlib.h>
-
-//QT includes
-#include <qpopupmenu.h>
-#include <qsplitter.h>
-#include <qguardedptr.h>
-#include <qlistview.h>
-
-//KDE includes
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kconfigbase.h>
-#include <ktoolbar.h>
-#include <kiconloader.h>
-#include <kstddirs.h>
-#include <kstdaction.h>
-#include <kmenubar.h>
-#include <kaccel.h>
-#include <klocale.h>
-#include <kaction.h>
-#include <khelpmenu.h>
-#include <kglobal.h>
-#include <kpopupmenu.h>
-
-/**Initializes the view of this widget*/
-void BibleTime::initView(){
-	KStartupLogo::setStatusMessage(i18n("Creating BibleTime's GUI") + QString::fromLatin1("..."));	
-
-	m_splitter = new QSplitter(this, "mainsplitter");
-//  m_splitter->setOpaqueResize( true );
-	setCentralWidget(m_splitter);	
-
-	m_mainIndex = new CMainIndex(m_splitter);
-	m_mainIndex->initTree();
-	m_mainIndex->setFocusPolicy(WheelFocus);       	
-
-	m_mdi = new CMDIArea(m_splitter, "mdiarea" );
-	m_mdi->setFocusPolicy(ClickFocus);
-
-	m_helpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData(), true, actionCollection());
-}
-
-/** Initializes the action objects of the GUI */
-void BibleTime::initActions() {
-	KStartupLogo::setStatusMessage(i18n("Initializing menu- and toolbars") + QString::fromLatin1("..."));
-	KAction* action = 0;
-
-	m_fileClearQueue_action = new KAction(i18n("Clear print queue"),
-    CResMgr::mainMenu::file::clearQueue::icon,
-    CResMgr::mainMenu::file::clearQueue::accel,
-    m_printer, SLOT(clearQueue()), actionCollection(),
-    CResMgr::mainMenu::file::clearQueue::actionName
-  );
-	m_fileClearQueue_action->setEnabled(false);
-	m_fileClearQueue_action->setToolTip( CResMgr::mainMenu::file::clearQueue::tooltip );
-	m_fileClearQueue_action->setWhatsThis( CResMgr::mainMenu::file::clearQueue::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_fileClearQueue_action->plugAccel( accel() );
-  #endif
-
-
-  //work around KDE 3.1 error messages
-//	if ( KAction* oldAction = actionCollection()->action(KStdAction::stdName(KStdAction::Print)) ) {
-//		actionCollection()->remove( oldAction );
-//  }
-  m_filePrint_action = KStdAction::print(this, SLOT( slotFilePrint() ), actionCollection());
-	m_filePrint_action->setEnabled(false);
-	m_filePrint_action->setToolTip( CResMgr::mainMenu::file::print::tooltip );
-	m_filePrint_action->setWhatsThis( CResMgr::mainMenu::file::print::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_filePrint_action->plugAccel( accel() );
-  #endif
-
-
-//	if ( KAction* oldAction = actionCollection()->action( KStdAction::stdName( KStdAction::Quit ) ) ) {	 //delete quit action if KDE created it
-//		actionCollection()->remove( oldAction );
-//  }
-  action = KStdAction::quit(kapp, SLOT( quit() ), actionCollection());
-	action->setToolTip( CResMgr::mainMenu::file::quit::tooltip );
-	action->setWhatsThis( CResMgr::mainMenu::file::quit::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-    action->plugAccel( accel() );
-  #endif
-
-  action = new KAction(i18n("Search in open module(s)"),
-    CResMgr::mainMenu::mainIndex::search::icon,
-    CResMgr::mainMenu::mainIndex::search::accel,
-    this, SLOT(slotSearchModules()), actionCollection(),
-    CResMgr::mainMenu::mainIndex::search::actionName
-  );
-  action->setToolTip( CResMgr::mainMenu::mainIndex::search::tooltip );
-  action->setWhatsThis( CResMgr::mainMenu::mainIndex::search::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-    action->plugAccel( accel() );
-  #endif
-
-  action = new KAction(i18n("Search in default bible"),
-    CResMgr::mainMenu::mainIndex::searchdefaultbible::icon,
-    CResMgr::mainMenu::mainIndex::searchdefaultbible::accel,
-    this, SLOT(slotSearchDefaultBible()), actionCollection(),
-    CResMgr::mainMenu::mainIndex::searchdefaultbible::actionName
-  );
-  action->setToolTip( CResMgr::mainMenu::mainIndex::searchdefaultbible::tooltip );
-  action->setWhatsThis( CResMgr::mainMenu::mainIndex::searchdefaultbible::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	action->plugAccel( accel() );
-  #endif
-
-  m_viewToolbar_action = KStdAction::showToolbar(this, SLOT( slotToggleToolbar() ), actionCollection());
-	m_viewToolbar_action->setToolTip( CResMgr::mainMenu::view::showToolBar::tooltip );
-	m_viewToolbar_action->setWhatsThis( CResMgr::mainMenu::view::showToolBar::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_viewToolbar_action->plugAccel( accel() );
-  #endif
-
-
-  m_viewMainIndex_action = new KToggleAction(i18n("&Show main index"),
-    CResMgr::mainMenu::view::showMainIndex::icon,
-    CResMgr::mainMenu::view::showMainIndex::accel,
-		this, SLOT(slotToggleGroupManager()), actionCollection(),
-    CResMgr::mainMenu::view::showMainIndex::actionName);
-	m_viewMainIndex_action->setToolTip( CResMgr::mainMenu::view::showMainIndex::tooltip );
-	m_viewMainIndex_action->setWhatsThis( CResMgr::mainMenu::view::showMainIndex::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-    m_viewMainIndex_action->plugAccel( accel() );
-  #endif
-
-  action = KStdAction::preferences(this, SLOT( slotSettingsOptions() ), actionCollection());
-	action->setToolTip( CResMgr::mainMenu::settings::optionsDialog::tooltip );
-	action->setWhatsThis( CResMgr::mainMenu::settings::optionsDialog::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	action->plugAccel( accel() );
-  #endif
-
-  action = new KAction(i18n("Configure &Sword"),
-    CResMgr::mainMenu::settings::swordSetupDialog::icon,
-    CResMgr::mainMenu::settings::swordSetupDialog::accel,
-		this, SLOT( slotSwordSetupDialog() ), actionCollection(),
-    CResMgr::mainMenu::settings::swordSetupDialog::actionName
-  );
-	action->setToolTip( CResMgr::mainMenu::settings::swordSetupDialog::tooltip );
-	action->setWhatsThis( CResMgr::mainMenu::settings::swordSetupDialog::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-    action->plugAccel( accel() );
-  #endif
-
-  action = KStdAction::configureToolbars(this, SLOT( slotSettingsToolbar() ), actionCollection());
-	action->setToolTip( CResMgr::mainMenu::settings::editToolBar::tooltip );
-	action->setWhatsThis( CResMgr::mainMenu::settings::editToolBar::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-    action->plugAccel( accel() );
-  #endif
-
-  m_windowCascade_action = new KAction(i18n("&Cascade"),
-    CResMgr::mainMenu::window::cascade::icon,
-    CResMgr::mainMenu::window::cascade::accel,
-		m_mdi, SLOT(myCascade()), actionCollection(),
-    CResMgr::mainMenu::window::cascade::actionName
-  );
-	m_windowCascade_action->setToolTip( CResMgr::mainMenu::window::cascade::tooltip );
-	m_windowCascade_action->setWhatsThis( CResMgr::mainMenu::window::cascade::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowCascade_action->plugAccel( accel());
-  #endif
-
-
-  m_windowTile_action = new KAction(i18n("&Tile"),
-    CResMgr::mainMenu::window::tile::icon,
-    CResMgr::mainMenu::window::tile::accel,
-    m_mdi, SLOT(myTile()), actionCollection(),
-    CResMgr::mainMenu::window::tile::actionName
-	);
-	m_windowTile_action->setToolTip( CResMgr::mainMenu::window::tile::tooltip );
-	m_windowTile_action->setWhatsThis( CResMgr::mainMenu::window::tile::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowTile_action->plugAccel( accel() );
-  #endif
-
-
-	m_windowAutoCascade_action 	= new KToggleAction(i18n("&Auto cascade"),
-    CResMgr::mainMenu::window::autoCascade::icon,
-		CResMgr::mainMenu::window::autoCascade::accel,
-    this, SLOT(slotAutoCascade()), actionCollection(),
-    CResMgr::mainMenu::window::autoCascade::actionName
-  );
-	m_windowAutoCascade_action->setToolTip( CResMgr::mainMenu::window::autoCascade::tooltip );
-	m_windowAutoCascade_action->setWhatsThis( CResMgr::mainMenu::window::autoCascade::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowAutoCascade_action->plugAccel( accel() );
-  #endif
-
-
-	m_windowAutoTile_action = new KToggleAction(i18n("A&uto Tile"),
-    CResMgr::mainMenu::window::autoTile::icon,
-		CResMgr::mainMenu::window::autoTile::accel,
-    this, SLOT(slotAutoTile()), actionCollection(),
-    CResMgr::mainMenu::window::autoTile::actionName
-  );
-	m_windowAutoTile_action->setToolTip( CResMgr::mainMenu::window::autoTile::tooltip );
-	m_windowAutoTile_action->setWhatsThis( CResMgr::mainMenu::window::autoTile::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowAutoTile_action->plugAccel( accel() );
-  #endif
-
-
-  m_windowCloseAll_action = new KAction(i18n("&Close all"),
-    CResMgr::mainMenu::window::closeAll::icon,
-    CResMgr::mainMenu::window::closeAll::accel,
-    m_mdi, SLOT(deleteAll()), actionCollection(),
-    CResMgr::mainMenu::window::closeAll::actionName
-  );
-	m_windowCloseAll_action->setToolTip( CResMgr::mainMenu::window::closeAll::tooltip );
-	m_windowCloseAll_action->setWhatsThis( CResMgr::mainMenu::window::closeAll::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowCloseAll_action->plugAccel( accel() );
-  #endif
-
-
-	m_windowSaveProfile_action = new KActionMenu(i18n("&Save session"),
-    CResMgr::mainMenu::window::saveProfile::icon,
-    actionCollection(),
-    CResMgr::mainMenu::window::saveProfile::actionName
-  );
-	m_windowSaveProfile_action->setToolTip( CResMgr::mainMenu::window::saveProfile::tooltip );
-	m_windowSaveProfile_action->setWhatsThis( CResMgr::mainMenu::window::saveProfile::whatsthis );
-  #if KDE_VERSION_MINOR < 1                           
-  	m_windowSaveProfile_action->plugAccel( accel() );
-  #endif
-
-
-  m_windowSaveToNewProfile_action = new KAction(i18n("&Save as new session"),
-    CResMgr::mainMenu::window::saveToNewProfile::icon,
-    CResMgr::mainMenu::window::saveToNewProfile::accel,
-    this, SLOT(saveToNewProfile()), actionCollection(),
-    CResMgr::mainMenu::window::saveToNewProfile::actionName
-  );
-	m_windowSaveToNewProfile_action->setToolTip( CResMgr::mainMenu::window::saveToNewProfile::tooltip );
-	m_windowSaveToNewProfile_action->setWhatsThis( CResMgr::mainMenu::window::saveToNewProfile::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowSaveToNewProfile_action->plugAccel( accel() );
-  #endif
-  
-
-	m_windowLoadProfile_action = new KActionMenu(i18n("&Load session"),
-    CResMgr::mainMenu::window::loadProfile::icon,
-    actionCollection(),
-    CResMgr::mainMenu::window::loadProfile::actionName
-  );
-	m_windowLoadProfile_action->setToolTip( CResMgr::mainMenu::window::loadProfile::tooltip );
-	m_windowLoadProfile_action->setWhatsThis( CResMgr::mainMenu::window::loadProfile::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowLoadProfile_action->plugAccel( accel() );
-  #endif
-
-
-	m_windowEditProfiles_action = new KAction(i18n("&Configure sessions"),
-    CResMgr::mainMenu::window::setupProfiles::icon,
-    CResMgr::mainMenu::window::setupProfiles::accel,
-    this, SLOT(editProfiles()), actionCollection(),
-    CResMgr::mainMenu::window::setupProfiles::actionName
-  );
-	m_windowEditProfiles_action->setToolTip( CResMgr::mainMenu::window::setupProfiles::tooltip );
-	m_windowEditProfiles_action->setWhatsThis( CResMgr::mainMenu::window::setupProfiles::whatsthis );
-  #if KDE_VERSION_MINOR < 1
-  	m_windowEditProfiles_action->plugAccel( accel() );
-  #endif
-
-
-	m_windowFullscreen_action = new KToggleAction(i18n("&Fullscreen mode"),
-    CResMgr::mainMenu::window::showFullscreen::icon,
-		CResMgr::mainMenu::window::showFullscreen::accel,
-    this, SLOT(toggleFullscreen()), actionCollection(),
-    CResMgr::mainMenu::window::showFullscreen::actionName
-  );
-	m_windowFullscreen_action->setToolTip( CResMgr::mainMenu::window::showFullscreen::tooltip );
-	m_windowFullscreen_action->setWhatsThis( CResMgr::mainMenu::window::showFullscreen::whatsthis );
-	m_windowFullscreen_action->setShortcutConfigurable(true);
-  #if KDE_VERSION_MINOR < 1
-  	m_windowFullscreen_action->plugAccel( accel() );
-  #endif
-
-	QPtrList<CProfile> profiles = m_profileMgr.profiles();
-	KPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
-	KPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
-	connect(loadPopup, SIGNAL(activated(int)), SLOT(loadProfile(int)));
-	connect(savePopup, SIGNAL(activated(int)), SLOT(saveProfile(int)));
-	for (CProfile* p = profiles.first(); p; p = profiles.next()) {
-		savePopup->insertItem(p->name());
-		loadPopup->insertItem(p->name());
-	}
-
-	if ( actionCollection()->action( KStdAction::stdName(KStdAction::HelpContents) )) {	 //delete help action if KDE created it
-		actionCollection()->remove(actionCollection()->action(KStdAction::stdName(KStdAction::HelpContents)) );
-  }
-
-  action = new KAction(i18n("&Handbook"),
-    CResMgr::mainMenu::help::handbook::icon,
-    CResMgr::mainMenu::help::handbook::accel,
-    this, SLOT(openOnlineHelp_Handbook()), actionCollection(),
-    CResMgr::mainMenu::help::handbook::actionName
-  );
-  action->setToolTip( CResMgr::mainMenu::help::handbook::tooltip );
-  action->setWhatsThis( CResMgr::mainMenu::help::handbook::whatsthis  );
-  #if KDE_VERSION_MINOR < 1
-	  action->plugAccel( accel() );
-  #endif
-
-	action = new KAction(i18n("&Bible Study Howto"),
-    CResMgr::mainMenu::help::bibleStudyHowTo::icon,
-    CResMgr::mainMenu::help::bibleStudyHowTo::accel,
-    this, SLOT(openOnlineHelp_Howto()), actionCollection(),
-    CResMgr::mainMenu::help::bibleStudyHowTo::actionName
-  );
-  action->setToolTip( CResMgr::mainMenu::help::bibleStudyHowTo::tooltip );
-  action->setWhatsThis( CResMgr::mainMenu::help::bibleStudyHowTo::whatsthis  );
-  #if KDE_VERSION_MINOR < 1
-	  action->plugAccel( accel() );
-  #endif
-
-	action = KStdAction::whatsThis(this, SLOT(whatsThis()), actionCollection());
-	action->setToolTip(CResMgr::mainMenu::help::whatsThis::tooltip);
-	action->setWhatsThis(CResMgr::mainMenu::help::whatsThis::whatsthis);
-  #if KDE_VERSION_MINOR < 1
-	action->plugAccel( accel() );
-  #endif
-
-	action = KStdAction::reportBug(m_helpMenu, SLOT(reportBug()), actionCollection());
-	action->setToolTip(CResMgr::mainMenu::help::bugreport::tooltip);
-	action->setWhatsThis(CResMgr::mainMenu::help::bugreport::whatsthis);
-  #if KDE_VERSION_MINOR < 1
-	  action->plugAccel( accel() );
-  #endif
-//	action->setIcon(ICON_BUG_REPORT);
-
-	action = new KAction(i18n("&Daily tip"),
-    CResMgr::mainMenu::help::dailyTip::icon,
-    CResMgr::mainMenu::help::dailyTip::accel,
-    this, SLOT(slotHelpTipOfDay()), actionCollection(),
-    CResMgr::mainMenu::help::dailyTip::actionName
-  );
-	action->setToolTip(CResMgr::mainMenu::help::dailyTip::tooltip);
-	action->setWhatsThis(CResMgr::mainMenu::help::dailyTip::whatsthis);
-  #if KDE_VERSION_MINOR < 1
-	  action->plugAccel( accel() );
-  #endif
-  
-	if ( actionCollection()->action( KStdAction::stdName( KStdAction::AboutApp ) ) ) {	 //delete About KDE action if KDE created it
-		actionCollection()->remove(actionCollection()->action(KStdAction::stdName( KStdAction::AboutApp )));
-  }
-  action = KStdAction::aboutApp(m_helpMenu, SLOT(aboutApplication()), actionCollection());
-	action->setToolTip(CResMgr::mainMenu::help::aboutBibleTime::tooltip);
-	action->setWhatsThis(CResMgr::mainMenu::help::aboutBibleTime::whatsthis);
-
-	//delete About KDE action if KDE created it already
-	if ( actionCollection()->action( KStdAction::stdName( KStdAction::AboutKDE ) ) ) {	 //delete About KDE action if KDE created it
-		actionCollection()->remove(actionCollection()->action(KStdAction::stdName( KStdAction::AboutKDE )));
-  }
-	action = KStdAction::aboutKDE(m_helpMenu, SLOT(aboutKDE()), actionCollection());
-	action->setToolTip(CResMgr::mainMenu::help::aboutKDE::tooltip);
-	action->setWhatsThis(CResMgr::mainMenu::help::aboutKDE::whatsthis);
-}
-
-/** Initializes the menubar of BibleTime. */
-void BibleTime::initMenubar(){
-	//get the window and edit menus using the actions and their properties
-	m_windowMenu = dynamic_cast<QPopupMenu*>(m_windowTile_action->container(0));
-}
-
-/** Initializes the SIGNAL / SLOT connections */
-void BibleTime::initConnections(){
-	connect(m_mdi, SIGNAL(sigSetToplevelCaption(const QString&)),
-		this, SLOT(setPlainCaption(const QString&)));
-	connect(m_mdi, SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const QString&)),
-		this, SLOT(createReadDisplayWindow(ListCSwordModuleInfo, const QString&)));
-
-	if (m_windowMenu) {
-		connect(m_windowMenu, SIGNAL(aboutToShow()),
-			this, SLOT(slotWindowMenuAboutToShow()));
-		connect(m_windowMenu, SIGNAL(activated(int)),
-			this, SLOT(slotWindowMenuActivated(int)));
-	}
-	else {
-		qWarning("Main window: can't find window menu");
-  }
-
-
-	connect(m_mainIndex, SIGNAL(createReadDisplayWindow(ListCSwordModuleInfo, const QString&)),
-		this, SLOT(createReadDisplayWindow(ListCSwordModuleInfo,const QString&)));
-	connect(m_mainIndex, SIGNAL(createWriteDisplayWindow(CSwordModuleInfo*, const QString&, const CDisplayWindow::WriteWindowType&)),
-		this, SLOT(createWriteDisplayWindow(CSwordModuleInfo*,const QString&, const CDisplayWindow::WriteWindowType&)));
-    
-
-  //connect to the signals of the printer object
-  connect(m_printer, SIGNAL(addedFirstQueueItem()),
-		this, SLOT(slotSetPrintingStatus()));
-	connect(m_printer, SIGNAL(printingFinished()),
-		this, SLOT(slotPrintingFinished()));
-	connect(m_printer, SIGNAL(queueCleared()),
-		this, SLOT(slotSetPrintingStatus()));
-
-  //if we use KDE 3.1 we do not use our own printing status window, KDE >= 3.1 has a better one
-#ifdef KDE_VERSION_MINOR
-#if KDE_VERSION_MINOR < 1
-  connect(m_printer, SIGNAL(printingStarted()),
-		this, SLOT(slotPrintingStarted()));		
-	connect(m_printer, SIGNAL(printingFinished()),
-		this, SLOT(slotSetPrintingStatus()));		
-  connect(m_printer, SIGNAL(printingInterrupted()),
-		this, SLOT(slotPrintingFinished()));
-	connect(m_printer, SIGNAL(percentCompleted(const int)),
-		this, SLOT(slotPrintedPercent(const int)));
-#endif
-#endif
-
-	connect(m_printer, SIGNAL(printingInterrupted()),
-		this, SLOT(slotSetPrintingStatus()));
-
-}
-
-/** Initializes the backend */
-void BibleTime::initBackends(){
-	KStartupLogo::setStatusMessage(i18n("Initializing Sword") + QString::fromLatin1("..."));
-
-	m_backend = new CSwordBackend();
-	CPointers::setBackend(m_backend);
-	const CSwordBackend::LoadError errorCode = m_backend->initModules();
-
-	m_moduleList = 0;
-	if ( errorCode == CSwordBackend::NoError ) {	//no error
-		m_moduleList = &(m_backend->moduleList());
-	}
-	else {
-		m_moduleList = 0;
-		//show error message that initBackend failed
-		switch (errorCode) {
-			case CSwordBackend::NoSwordConfig: //mods.d or mods.conf missing
-			{
-				KStartupLogo::hideSplash();
-        CSwordSetupDialog dlg;
-        dlg.showPart( CSwordSetupDialog::Sword );
-        dlg.exec();
-				break;
-	    }
-
-			case CSwordBackend::NoModules: //no modules installed, but config exists
-			{
-				KStartupLogo::hideSplash();
-        CSwordSetupDialog dlg;
-        dlg.showPart( CSwordSetupDialog::Install );
-        dlg.exec();
-				break;
-		  }
-
-			default: //unknown error
-			{
-				KStartupLogo::hideSplash();
-        CSwordSetupDialog dlg;
-        dlg.showPart( CSwordSetupDialog::Sword );
-       	dlg.exec();
-				break;
-		  }
-		}
-	}
-	m_backend->booknameLanguage( CBTConfig::get(CBTConfig::language) );
-}
-
-/** Initializes the CPrinter object. */
-void BibleTime::initPrinter() {
-	KStartupLogo::setStatusMessage(i18n("Initializing print system") + QString::fromLatin1("..."));
-	CPointers::setPrinter( (m_printer = new CPrinter(this)) );
-}
-
-/** Apply the settings given by the profile p*/
-void BibleTime::applyProfileSettings( CProfile* p ){
-	if (!p) {
-		return;
-  }
-
-	if (m_initialized) //on startup KDE sets the main geometry
-    setGeometry( p->geometry() );
-	m_windowFullscreen_action->setChecked( p->fullscreen() );  //set the fullscreen button state
-	toggleFullscreen();  
-}
-
-/** Stores the settings of the mainwindow in the profile p */
-void BibleTime::storeProfileSettings( CProfile* p ){
-  if (!p || !m_windowFullscreen_action) {
-    return;
-  }
-  p->setFullscreen( m_windowFullscreen_action->isChecked() );
-	p->setGeometry(geometry());
-}
diff --git a/bibletime/bibletime_slots.cpp b/bibletime/bibletime_slots.cpp
deleted file mode 100644
index 644c69f..0000000
--- a/bibletime/bibletime_slots.cpp
+++ /dev/null
@@ -1,502 +0,0 @@
-/***************************************************************************
-                          bibletime_slots.cpp  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//own includes
-#include "bibletime.h"
-#include "config.h"
-
-#include "backend/cswordversekey.h"
-
-#include "util/ctoolclass.h"
-
-#include "frontend/cmdiarea.h"
-#include "frontend/cprofilemgr.h"
-#include "frontend/cprofile.h"
-#include "frontend/cprofilewindow.h"                       	
-#include "frontend/coptionsdialog.h"
-#include "frontend/cswordsetupdialog.h"
-#include "frontend/cbtconfig.h"
-#include "frontend/cinputdialog.h"
-#include "frontend/mainindex/cmainindex.h"
-#include "frontend/mainindex/cindexitem.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/cbiblereadwindow.h"
-#include "frontend/searchdialog/csearchdialog.h"
-
-#include "printing/cprinter.h"
-
-#include <errno.h>
-
-//QT includes
-#include <qprogressdialog.h>
-#include <qlistview.h>
-#include <qwhatsthis.h>
-#include <qvaluelist.h>
-#include <qclipboard.h>
-//#include <qxembed.h>
-#include <qinputdialog.h>
-
-//KDE includes
-#include <kaction.h>
-#include <kapplication.h>
-#include <kaboutkde.h>
-#include <kaboutdialog.h>
-#include <kbugreport.h>
-#include <kaboutapplication.h>
-#include <kstandarddirs.h>
-#include <kmenubar.h>
-#include <kaboutdata.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kedittoolbar.h>
-#include <kpopupmenu.h>
-#include <khelpmenu.h>
-#include <ktip.h>
-
-//Sword includes
-#include <versekey.h>
-
-/** Opens the optionsdialog of BibleTime. */
-void BibleTime::slotSettingsOptions(){
-	COptionsDialog *dlg = new COptionsDialog(this, "COptionsDialog", accel());
-  connect(dlg, SIGNAL(signalSettingsChanged()), SLOT(slotSettingsChanged()) );
-	
-	dlg->exec();
-	dlg->delayedDestruct();
-}
-
-/** Is called when settings in the optionsdialog were changed (ok or apply) */
-void BibleTime::slotSettingsChanged(){
- 	const QString language = CBTConfig::get(CBTConfig::language);
- 	m_backend->booknameLanguage(language);
-
- 	QListViewItemIterator it( m_mainIndex );
- 	CItemBase* item = 0;
- 	for ( ; it.current(); ++it ) {
- 		if ( (item = dynamic_cast<CItemBase*>(it.current())) ) {
-      item->update();
- 		}
-  }
-
-  refreshDisplayWindows();
-  refreshProfileMenus();
-}
-
-/** Opens the sword setup dialog of BibleTime. */
-void BibleTime::slotSwordSetupDialog(){
-	CSwordSetupDialog *dlg = new CSwordSetupDialog(this, "CSwordSetupDialog");
-  connect(dlg, SIGNAL(signalSwordSetupChanged()), SLOT(slotSwordSetupChanged()) );
-
-	dlg->exec();
-	dlg->delayedDestruct();
-}
-
-/** Is called when settings in the sword setup dialog were changed (ok or apply) */
-void BibleTime::slotSwordSetupChanged(){
-//  qWarning("swordChanged: start");
-  /*
-    Refresh everything here what might have changed
-    these are the mainindex, the searchdialog, the displaywindows
-    But at first we have to reset the Sword backend to reload the modules
-  */
-//  qWarning("swordChanged: reload bookmarks");
-  m_mainIndex->saveBookmarks();
-//  qWarning("swordChanged: reload modules");
-
-//  m_backend->reloadModules();
-	CPointers::deleteBackend();
-	m_backend = new CSwordBackend();
-	CPointers::setBackend(m_backend);
-	/*const CSwordBackend::LoadError errorCode = */ m_backend->initModules();
-
-//  qWarning("swordChanged: reload sword");
-  m_mainIndex->reloadSword();
-
-//  refresh display windows
-//  qWarning("swordChanged: reload windows");
-  refreshDisplayWindows();
-
-
-//  refreshProfileMenus();
-}
-
-
-
-/** Shows the daily tip */
-void BibleTime::slotHelpTipOfDay(){
-	KTipDialog::setShowOnStart( CBTConfig::get(CBTConfig::tips) );
-	KTipDialog::showTip(this, "bibletime/tips", true);
-}
-
-/** Is called just before the window menu is ahown. */
-void BibleTime::slotWindowMenuAboutToShow(){
-	if (!m_windowMenu) {
-		return;
-  }
-
-	if ( m_windowSaveProfile_action->isPlugged() )
-		m_windowSaveProfile_action->unplug(m_windowMenu);
-	if ( m_windowLoadProfile_action->isPlugged() )
-		m_windowLoadProfile_action->unplug(m_windowMenu);
-	if ( m_windowEditProfiles_action->isPlugged() )
-		m_windowEditProfiles_action->unplug(m_windowMenu);
-	if ( m_windowFullscreen_action->isPlugged() )
-		m_windowFullscreen_action->unplug(m_windowMenu);
-				
-	if ( m_windowCascade_action->isPlugged() )
-		m_windowCascade_action->unplug(m_windowMenu);
-	if ( m_windowTile_action->isPlugged() )
-		m_windowTile_action->unplug(m_windowMenu);
-	if ( m_windowAutoCascade_action->isPlugged() )
-		m_windowAutoCascade_action->unplug(m_windowMenu);
-	if ( m_windowAutoTile_action->isPlugged() )
-		m_windowAutoTile_action->unplug(m_windowMenu);
-	if ( m_windowCloseAll_action->isPlugged() )
-		m_windowAutoTile_action->unplug(m_windowMenu);
-
-	m_windowMenu->clear();
-			
-	m_windowSaveProfile_action->plug(m_windowMenu);	
-	m_windowSaveToNewProfile_action->plug(m_windowMenu);	
-    m_windowLoadProfile_action->plug(m_windowMenu);
-	m_windowEditProfiles_action->plug(m_windowMenu);	
-	m_windowMenu->insertSeparator();	
-	m_windowFullscreen_action->plug(m_windowMenu);				
-	m_windowMenu->insertSeparator();	
-	m_windowCascade_action->plug(m_windowMenu);
-	m_windowTile_action->plug(m_windowMenu);
-	m_windowAutoCascade_action->plug(m_windowMenu);
-	m_windowAutoTile_action->plug(m_windowMenu);
-	m_windowCloseAll_action->plug(m_windowMenu);	
-	
-	if ( m_mdi->windowList().isEmpty() ) {
-		m_windowCascade_action->setEnabled(false);
-		m_windowTile_action->setEnabled(false);		
-		m_windowCloseAll_action->setEnabled(false);		
-	}
-	else if (m_mdi->windowList().count() == 1) {
-		m_windowTile_action->setEnabled( false );
-		m_windowCascade_action->setEnabled( false );
-		m_windowCloseAll_action->setEnabled( true );
-		m_windowMenu->insertSeparator();
-	} else {
-		m_windowTile_action->setEnabled( !m_windowAutoTile_action->isChecked() && !m_windowAutoCascade_action->isChecked() );
-		m_windowCascade_action->setEnabled( !m_windowAutoCascade_action->isChecked() && !!m_windowAutoTile_action->isChecked());
-		m_windowCloseAll_action->setEnabled( true );
-		m_windowMenu->insertSeparator();		
-	}
-	
-	QWidgetList windows = m_mdi->windowList();
-	int i, id;
-	for ( i = 0; i < int(windows.count()); ++i ) {
-    QString caption;
-    if (CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(windows.at(i)))
-      caption = QString::fromLatin1("%1 (%2)").arg(w->caption()).arg(w->key()->key());
-    else
-      caption = windows.at(i)->caption();
-		id = m_windowMenu->insertItem(QString::fromLatin1("&%1 ").arg(i+1) + caption /*+ windows.at()*/,
-			this, SLOT(slotWindowMenuActivated( int )) );
-		m_windowMenu->setItemParameter( id, i );
-	  m_windowMenu->setItemChecked( id, m_mdi->activeWindow() == windows.at(i) );
-	}
-}
-
-/** This slot is connected with the windowAutoTile_action object */
-void BibleTime::slotAutoTile(){
-	if (m_windowAutoTile_action->isChecked()) {
-		m_windowAutoCascade_action->setChecked(false);
-		m_mdi->setGUIOption( CMDIArea::autoTile );
-	}
-	else if (!m_windowAutoCascade_action->isChecked()) { //tile and cascade are enabled/disbled in  slotWindowMenuAboutToShow
-    m_mdi->setGUIOption( CMDIArea::Nothing );    
-  }
-}
-
-/** This slot is connected with the windowAutoCascade_action object */
-void BibleTime::slotAutoCascade(){
-	if (m_windowAutoCascade_action->isChecked()) {
-		m_windowAutoTile_action->setChecked(false);
-		m_mdi->setGUIOption( CMDIArea::autoCascade );
-	}
-	else if (!m_windowAutoTile_action->isChecked()) { //tile and cascade are enabled/disbled in  slotWindowMenuAboutToShow
-		m_mdi->setGUIOption( CMDIArea::Nothing );    
-  }
-}
-
-void BibleTime::slotWindowMenuActivated( int id ) {
-  if (!m_windowMenu)
-  	return;
-  	
-//  QString dummy;
-  QWidget* w = m_mdi->windowList().at( id );
-  if ( w )
-		w->setFocus();
-}
-
-
-/** Shows/hides the toolbar */
-void BibleTime::slotToggleToolbar(){
-	if (m_viewToolbar_action->isChecked())
-		toolBar("mainToolBar")->show();
-	else
-		toolBar("mainToolBar")->hide();
-}
-
-/** Shows or hides the groupmanager. */
-void BibleTime::slotToggleGroupManager() {
-	if (m_viewMainIndex_action->isChecked()) {
-		m_mainIndex->show();
-  }
-	else {
-		m_mainIndex->hide();
-  }
-}
-
-/** Opens a toolbar editor */
-void BibleTime::slotSettingsToolbar(){
-	KEditToolbar dlg(actionCollection());
-	if (dlg.exec()) {
-		createGUI();
-  }
-}
-
-/** Opens the print dialog. */
-void BibleTime::slotFilePrint(){
-	m_printer->setup(this);	//opens the printer dialog
-}
-
-/** Enables the "Clear printer queue" action */
-void BibleTime::slotSetPrintingStatus(){
-	const bool enable = (m_printer->queue().count() > 0);
-	m_filePrint_action->setEnabled( enable );
-	m_fileClearQueue_action->setEnabled( enable );
-}
-
-/** Printing was started */
-void BibleTime::slotPrintingStarted(){
-	m_progress = new QProgressDialog(i18n("Printing..."), i18n("Abort printing"),100,this, "progress", true);
-	connect(m_progress, SIGNAL(cancelled()), SLOT(slotAbortPrinting()));
-	m_progress->setProgress(0);
-	m_progress->setMinimumDuration(0);
-  m_progress->setCaption("BibleTime");
-	m_progress->show();
-}
-
-/** Printing was finished */
-void BibleTime::slotPrintingFinished(){
-	delete m_progress;
-	m_progress = 0;	
-}
-
-/** No descriptions */
-void BibleTime::slotPrintedPercent( const int percent ){
-	if (m_progress)
-		m_progress->setProgress(percent);
-}
-
-/** Aborts the printing */
-void BibleTime::slotAbortPrinting(){
-	m_printer->abort();
-	if (m_progress)
-		slotPrintingFinished();
-}
-
-
-void BibleTime::slotSearchModules() {
-  //get the modules of the open windows
-  ListCSwordModuleInfo modules;
-  
-	QWidgetList windows = m_mdi->windowList();
-	for ( int i = 0; i < static_cast<int>(windows.count()); ++i ) {
-    if (CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(windows.at(i))) {
-      ListCSwordModuleInfo windowModules = w->modules();
-      for (CSwordModuleInfo* module = windowModules.first(); module; module = windowModules.next()) {
-        modules.append(module);
-      };
-    };
-  };
-  
-  CSearchDialog::openDialog(modules, QString::null);
-}
-
-/* Search default Bible slot
- * Call CSearchDialog::openDialog with only the default bible module
- */
-void BibleTime::slotSearchDefaultBible() {
-  ListCSwordModuleInfo module;
-  CSwordModuleInfo* bible = CPointers::backend()->findModuleByDescription(CBTConfig::get(CBTConfig::standardBible));
-  if(bible != 0)
-    module.append(bible);
-
-  CSearchDialog::openDialog(module, QString::null);
-}
-
-void BibleTime::openOnlineHelp_Handbook() {
-   kapp->invokeHelp("", "bibletime/handbook");
-}
-
-void BibleTime::openOnlineHelp_Howto() {
-  kapp->invokeHelp("", "bibletime/howto");
-}
-
-/** Saves the current settings into the currently activatred profile. */
-void BibleTime::saveProfile(int ID){
-	m_mdi->setUpdatesEnabled(false);
-
-  KPopupMenu* popup = m_windowSaveProfile_action->popupMenu();
-	if ( CProfile* p = m_profileMgr.profile(popup->text(ID)) ) {
-		saveProfile(p);
-  }
-
-	m_mdi->setUpdatesEnabled(true);	
-}
-
-void BibleTime::saveProfile(CProfile* profile){
-	if (!profile) {
-		return;
-  }
-
-	//save mainwindow settings
-	storeProfileSettings(profile);
-			
-	QWidgetList windows = m_mdi->windowList();
-	QPtrList<CProfileWindow> profileWindows;
-	for (QWidget* w = windows.first(); w; w = windows.next()) {
-		CDisplayWindow* displayWindow = dynamic_cast<CDisplayWindow*>(w);
-		if (!displayWindow) {
-			continue;
-    }
-
-		CProfileWindow* profileWindow = new CProfileWindow();
-		displayWindow->storeProfileSettings(profileWindow);
-		profileWindows.append(profileWindow);
-	}
-	profile->save(profileWindows);
-
-//clean up memory - delete all created profile windows
-	profileWindows.setAutoDelete(true);
-	profileWindows.clear();
-}
-
-void BibleTime::loadProfile(int ID){	
-	KPopupMenu* popup = m_windowLoadProfile_action->popupMenu();
-  if ( CProfile* p = m_profileMgr.profile( popup->text(ID) ) ) {
-    m_mdi->deleteAll();
-
-    loadProfile(p);
-  }
-}
-
-void BibleTime::loadProfile(CProfile* p){
-	if (!p)
-		return;
-    
-  QPtrList<CProfileWindow> windows = p->load();
-
-	//load mainwindow setttings
-	applyProfileSettings(p);
-
-	m_mdi->setUpdatesEnabled(false);//don't auto tile or auto cascade, this would mess up everything!!
-
-  QWidget* focusWindow = 0;
-  
-  for (CProfileWindow* w = windows.first(); w; w = windows.next()) {
-		const QString key = w->key();
-		QStringList usedModules = w->modules();
-		ListCSwordModuleInfo modules;
-		for ( QStringList::Iterator it = usedModules.begin(); it != usedModules.end(); ++it ) {
-			if (CSwordModuleInfo* m = m_backend->findModuleByName(*it)) {
-				modules.append(m);
-      }
-    }
-    if (!modules.count()) { //are the modules still installed? If not continue wih next session window
-      continue;
-    }
-
-    //is w->isWriteWindow is false we create a write window, otherwise a read window
-    CDisplayWindow* displayWindow = 0;
-    if (w->writeWindowType() > 0) { //create a write window
-      displayWindow = createWriteDisplayWindow(modules.first(), key, CDisplayWindow::WriteWindowType(w->writeWindowType()) );
-		}
-    else { //create a read window
-      displayWindow = createReadDisplayWindow(modules, key);
-		}
-    
-    if (displayWindow) { //if a window was created initialize it.
-      if (w->hasFocus()) {
-        focusWindow = displayWindow;
-      }
-
-//      displayWindow->parentWidget()->lower();
-      displayWindow->applyProfileSettings(w);
-    };
-	}
-
-	m_mdi->setUpdatesEnabled(true);
-
-  if (focusWindow) {
-//    focusWindow->parentWidget()->raise();
-//    focusWindow->setFocus();
-  }
-}
-
-void BibleTime::toggleFullscreen(){
-//  if (!isVisible())
-//    return;
-  
-	if (m_windowFullscreen_action->isChecked()) {
- 		showFullScreen();
-  }
-	else if (isVisible()){
-    showNormal();
-  }
-}
-
-void BibleTime::editProfiles(){
-	COptionsDialog *dlg = new COptionsDialog(this, "COptionsDialog", accel() );
-  connect(dlg, SIGNAL(signalSettingsChanged()), SLOT(slotSettingsChanged()) );
-	dlg->showPart(COptionsDialog::ViewProfiles);	
-	dlg->exec();
-
-	dlg->delayedDestruct();	
-}
-
-/** Saves current settings into a new profile. */
-void BibleTime::saveToNewProfile(){
-  bool ok = false;
-  const QString name = QInputDialog::getText(i18n("Session name:"), i18n("Please enter a name for the new session."), QLineEdit::Normal, QString::null, &ok, this);
-  if (ok && !name.isEmpty()) {
-    CProfile* profile = m_profileMgr.create(name);
-    saveProfile(profile);
-  };
-  refreshProfileMenus();
-}
-
-/** Slot to refresh the save profile and load profile menus. */
-void BibleTime::refreshProfileMenus(){
- 	//refresh the load profile and save profile menus
-	m_profileMgr.refresh();
- 	KPopupMenu* savePopup = m_windowSaveProfile_action->popupMenu();
- 	KPopupMenu* loadPopup = m_windowLoadProfile_action->popupMenu();
- 	savePopup->clear();
- 	loadPopup->clear();
- 	QPtrList<CProfile> profiles = m_profileMgr.profiles();
- 	for (CProfile* p = profiles.first(); p; p = profiles.next()) {
-		savePopup->insertItem(p->name());
-		loadPopup->insertItem(p->name());
- 	}
-}
diff --git a/bibletime/bibletimeapp.cpp b/bibletime/bibletimeapp.cpp
deleted file mode 100644
index d5ed628..0000000
--- a/bibletime/bibletimeapp.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
-                          bibletimeapp.cpp  -  description
-                             -------------------
-    begin                : Sam Jul 12 2003
-    copyright            : (C) 2003 by The BibleTime team
-    email                : info@bibletime.info
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "bibletimeapp.h"
-
-#include "frontend/cbtconfig.h"
-
-#include "util/cresmgr.h"
-
-BibleTimeApp::BibleTimeApp(){
-  CResMgr::init_i18n();
-}
-
-BibleTimeApp::~BibleTimeApp(){
-  if (backend()) {
-    deleteBackend();
-  }
-
-  //we can set this safely now because we close now (hopyfully without crash)
-  CBTConfig::set(CBTConfig::crashedLastTime, false);
-  CBTConfig::set(CBTConfig::crashedTwoTimes, false);
-}
diff --git a/bibletime/bibletimeapp.h b/bibletime/bibletimeapp.h
deleted file mode 100644
index 28a3a5e..0000000
--- a/bibletime/bibletimeapp.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/***************************************************************************
-                          bibletimeapp.h  -  description
-                             -------------------
-    begin                : Sam Jul 12 2003
-    copyright            : (C) 2003 by The BibleTime team
-    email                : info@bibletime.info
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef BIBLETIMEAPP_H
-#define BIBLETIMEAPP_H
-
-//BibleTime
-#include "util/cpointers.h"
-
-//KDE
-#include <kapplication.h>
-
-/** The BibleTimeApp class is used to clean up all instances of the backend and to delete all created module objects.
-  * @author The BibleTime team
-  */
-class BibleTimeApp : public KApplication, public CPointers {
-public: 
-	BibleTimeApp();
-	virtual ~BibleTimeApp();
-};
-
-#endif
diff --git a/bibletime/dirlist b/bibletime/dirlist
deleted file mode 100644
index 08e65ca..0000000
--- a/bibletime/dirlist
+++ /dev/null
@@ -1,7 +0,0 @@
-total 320

-drwxrwxr-x   2 508      702          4096 Apr 13  2002 dead

-drwxrwxr-x   2 504      702          4096 Nov 24 02:25 locales.d

-drwxrwxr-x   2 504      702          8192 Jan 21 12:36 mods.d

--rw-rw-r--   1 526      702         69231 Jan 28 04:04 mods.d.tar.gz

--rw-rw-r--   1 526      702         63610 Mar  4  2003 mods.d.tar.gz.old

-drwxrwxr-x   6 504      702          4096 Oct  7  2002 modules

diff --git a/bibletime/frontend/Makefile.am b/bibletime/frontend/Makefile.am
deleted file mode 100644
index 163e94b..0000000
--- a/bibletime/frontend/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-INCLUDES = $(all_includes)
-libfrontend_a_METASOURCES = AUTO
-noinst_LIBRARIES = libfrontend.a
-
-libfrontend_a_SOURCES = \
-btinstallmgr.cpp \
-cbtconfig.cpp \
-cinputdialog.cpp \
-coptionsdialog.cpp \
-cswordsetupdialog.cpp \
-cprofilemgr.cpp \
-cprofile.cpp \
-cprofilewindow.cpp \
-cexportmanager.cpp \
-cmdiarea.cpp \
-kstartuplogo.cpp \
-ctooltipmanager.cpp \
-ctooltip.cpp \
-cdragdropmgr.cpp
-
-all_headers = cmdiarea.h \
-btinstallmgr.h \
-cbtconfig.h \
-cinputdialog.h \
-coptionsdialog.h \
-cswordsetupdialog.h \
-cprofilemgr.h \
-cprofile.h \
-cprofilewindow.h \
-cexportmanager.h \
-cmdiarea.h \
-kstartuplogo.h \
-ctooltipmanager.h \
-ctooltip.h \
-cdragdropmgr.h
-
-EXTRA_DIST = $(libfrontend_a_SOURCES) $(all_headers)
-
-SUBDIRS = \
-mainindex \
-keychooser \
-displaywindow \
-display \
-searchdialog
-
-
-
-
diff --git a/bibletime/frontend/Makefile.in b/bibletime/frontend/Makefile.in
deleted file mode 100644
index 6847af6..0000000
--- a/bibletime/frontend/Makefile.in
+++ /dev/null
@@ -1,911 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-#>- libfrontend_a_METASOURCES = AUTO
-noinst_LIBRARIES = libfrontend.a
-
-libfrontend_a_SOURCES = \
-btinstallmgr.cpp \
-cbtconfig.cpp \
-cinputdialog.cpp \
-coptionsdialog.cpp \
-cswordsetupdialog.cpp \
-cprofilemgr.cpp \
-cprofile.cpp \
-cprofilewindow.cpp \
-cexportmanager.cpp \
-cmdiarea.cpp \
-kstartuplogo.cpp \
-ctooltipmanager.cpp \
-ctooltip.cpp \
-cdragdropmgr.cpp
-
-
-all_headers = cmdiarea.h \
-btinstallmgr.h \
-cbtconfig.h \
-cinputdialog.h \
-coptionsdialog.h \
-cswordsetupdialog.h \
-cprofilemgr.h \
-cprofile.h \
-cprofilewindow.h \
-cexportmanager.h \
-cmdiarea.h \
-kstartuplogo.h \
-ctooltipmanager.h \
-ctooltip.h \
-cdragdropmgr.h
-
-
-EXTRA_DIST = $(libfrontend_a_SOURCES) $(all_headers)
-
-SUBDIRS = \
-mainindex \
-keychooser \
-displaywindow \
-display \
-searchdialog
-
-subdir = bibletime/frontend
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libfrontend_a_AR = $(AR) cru
-libfrontend_a_LIBADD =
-am_libfrontend_a_OBJECTS = btinstallmgr.$(OBJEXT) cbtconfig.$(OBJEXT) \
-	cinputdialog.$(OBJEXT) coptionsdialog.$(OBJEXT) \
-	cswordsetupdialog.$(OBJEXT) cprofilemgr.$(OBJEXT) \
-	cprofile.$(OBJEXT) cprofilewindow.$(OBJEXT) \
-	cexportmanager.$(OBJEXT) cmdiarea.$(OBJEXT) \
-	kstartuplogo.$(OBJEXT) ctooltipmanager.$(OBJEXT) \
-	ctooltip.$(OBJEXT) cdragdropmgr.$(OBJEXT)
-#>- libfrontend_a_OBJECTS = $(am_libfrontend_a_OBJECTS)
-#>+ 11
-libfrontend_a_final_OBJECTS = libfrontend_a.all_cpp.o 
-libfrontend_a_nofinal_OBJECTS = btinstallmgr.$(OBJEXT) cbtconfig.$(OBJEXT) \
-	cinputdialog.$(OBJEXT) coptionsdialog.$(OBJEXT) \
-	cswordsetupdialog.$(OBJEXT) cprofilemgr.$(OBJEXT) \
-	cprofile.$(OBJEXT) cprofilewindow.$(OBJEXT) \
-	cexportmanager.$(OBJEXT) cmdiarea.$(OBJEXT) \
-	kstartuplogo.$(OBJEXT) ctooltipmanager.$(OBJEXT) \
-	ctooltip.$(OBJEXT) cdragdropmgr.$(OBJEXT)\
-coptionsdialog.moc.o ctooltip.moc.o btinstallmgr.moc.o cmdiarea.moc.o cswordsetupdialog.moc.o cinputdialog.moc.o 
-@KDE_USE_FINAL_FALSE@libfrontend_a_OBJECTS = $(libfrontend_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libfrontend_a_OBJECTS = $(libfrontend_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/btinstallmgr.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cbtconfig.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cdragdropmgr.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cexportmanager.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cinputdialog.Po ./$(DEPDIR)/cmdiarea.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/coptionsdialog.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cprofile.Po ./$(DEPDIR)/cprofilemgr.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cprofilewindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cswordsetupdialog.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/ctooltip.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/ctooltipmanager.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/kstartuplogo.Po
-#>+ 24
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/coptionsdialog.moc.P $(DEPDIR)/ctooltip.moc.P $(DEPDIR)/btinstallmgr.moc.P $(DEPDIR)/cmdiarea.moc.P $(DEPDIR)/cswordsetupdialog.moc.P $(DEPDIR)/cinputdialog.moc.P  $(DEPDIR)/libfrontend_a.all_cpp.P ./$(DEPDIR)/btinstallmgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cbtconfig.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cdragdropmgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cexportmanager.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cinputdialog.Po ./$(DEPDIR)/cmdiarea.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/coptionsdialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cprofile.Po ./$(DEPDIR)/cprofilemgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cprofilewindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordsetupdialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ctooltip.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ctooltipmanager.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/kstartuplogo.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/coptionsdialog.moc.P $(DEPDIR)/ctooltip.moc.P $(DEPDIR)/btinstallmgr.moc.P $(DEPDIR)/cmdiarea.moc.P $(DEPDIR)/cswordsetupdialog.moc.P $(DEPDIR)/cinputdialog.moc.P ./$(DEPDIR)/btinstallmgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cbtconfig.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cdragdropmgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cexportmanager.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cinputdialog.Po ./$(DEPDIR)/cmdiarea.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/coptionsdialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cprofile.Po ./$(DEPDIR)/cprofilemgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cprofilewindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cswordsetupdialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ctooltip.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ctooltipmanager.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/kstartuplogo.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libfrontend_a_SOURCES)
-
-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
-#>- 	all-recursive install-data-recursive install-exec-recursive \
-#>- 	installdirs-recursive install-recursive uninstall-recursive \
-#>- 	check-recursive installcheck-recursive
-#>+ 5
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-SOURCES = $(libfrontend_a_SOURCES)
-
-#>- all: all-recursive
-#>+ 1
-all: docs-am  all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/frontend/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libfrontend.a: $(libfrontend_a_OBJECTS) $(libfrontend_a_DEPENDENCIES) 
-	-rm -f libfrontend.a
-	$(libfrontend_a_AR) libfrontend.a $(libfrontend_a_OBJECTS) $(libfrontend_a_LIBADD)
-	$(RANLIB) libfrontend.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btinstallmgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbtconfig.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdragdropmgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cexportmanager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cinputdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmdiarea.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coptionsdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprofile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprofilemgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprofilewindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cswordsetupdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctooltip.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctooltipmanager.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kstartuplogo.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-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.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (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.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	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; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	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
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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-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; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	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)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(LIBRARIES)
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-recursive
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-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
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-noinstLIBRARIES \
-	clean-recursive ctags ctags-recursive distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-recursive distclean-tags distdir \
-	dvi dvi-am dvi-recursive info info-am info-recursive install \
-	install-am install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
-
-# 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:
-
-#>+ 3
-coptionsdialog.moc.cpp: $(srcdir)/coptionsdialog.h
-	$(MOC) $(srcdir)/coptionsdialog.h -o coptionsdialog.moc.cpp
-
-#>+ 2
-mocs: coptionsdialog.moc.cpp
-
-#>+ 3
-ctooltip.moc.cpp: $(srcdir)/ctooltip.h
-	$(MOC) $(srcdir)/ctooltip.h -o ctooltip.moc.cpp
-
-#>+ 2
-mocs: ctooltip.moc.cpp
-
-#>+ 3
-btinstallmgr.moc.cpp: $(srcdir)/btinstallmgr.h
-	$(MOC) $(srcdir)/btinstallmgr.h -o btinstallmgr.moc.cpp
-
-#>+ 2
-mocs: btinstallmgr.moc.cpp
-
-#>+ 3
-cmdiarea.moc.cpp: $(srcdir)/cmdiarea.h
-	$(MOC) $(srcdir)/cmdiarea.h -o cmdiarea.moc.cpp
-
-#>+ 2
-mocs: cmdiarea.moc.cpp
-
-#>+ 3
-cswordsetupdialog.moc.cpp: $(srcdir)/cswordsetupdialog.h
-	$(MOC) $(srcdir)/cswordsetupdialog.h -o cswordsetupdialog.moc.cpp
-
-#>+ 2
-mocs: cswordsetupdialog.moc.cpp
-
-#>+ 3
-cinputdialog.moc.cpp: $(srcdir)/cinputdialog.h
-	$(MOC) $(srcdir)/cinputdialog.h -o cinputdialog.moc.cpp
-
-#>+ 2
-mocs: cinputdialog.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  coptionsdialog.moc.cpp ctooltip.moc.cpp btinstallmgr.moc.cpp cmdiarea.moc.cpp cswordsetupdialog.moc.cpp cinputdialog.moc.cpp
-
-#>+ 2
-KDE_DIST=cprofilemgr.h cbtconfig.h ctooltipmanager.h kstartuplogo.h cexportmanager.h cprofilewindow.h cdragdropmgr.h cprofile.h cinputdialog.h ctooltip.h coptionsdialog.h btinstallmgr.h cmdiarea.h cswordsetupdialog.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libfrontend_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/btinstallmgr.cpp $(srcdir)/cbtconfig.cpp $(srcdir)/cinputdialog.cpp $(srcdir)/coptionsdialog.cpp $(srcdir)/cswordsetupdialog.cpp $(srcdir)/cprofilemgr.cpp $(srcdir)/cprofile.cpp $(srcdir)/cprofilewindow.cpp $(srcdir)/cexportmanager.cpp $(srcdir)/cmdiarea.cpp $(srcdir)/kstartuplogo.cpp $(srcdir)/ctooltipmanager.cpp $(srcdir)/ctooltip.cpp $(srcdir)/cdragdropmgr.cpp coptionsdialog.moc.cpp ctooltip.moc.cpp btinstallmgr.moc.cpp cmdiarea.moc.cpp cinputdialog.moc.cpp cswordsetupdialog.moc.cpp 
-	@echo 'creating libfrontend_a.all_cpp.cpp ...'; \
-	rm -f libfrontend_a.all_cpp.files libfrontend_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libfrontend_a.all_cpp.final; \
-	for file in btinstallmgr.cpp cbtconfig.cpp cinputdialog.cpp coptionsdialog.cpp cswordsetupdialog.cpp cprofilemgr.cpp cprofile.cpp cprofilewindow.cpp cexportmanager.cpp cmdiarea.cpp kstartuplogo.cpp ctooltipmanager.cpp ctooltip.cpp cdragdropmgr.cpp coptionsdialog.moc.cpp ctooltip.moc.cpp btinstallmgr.moc.cpp cmdiarea.moc.cpp cinputdialog.moc.cpp cswordsetupdialog.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libfrontend_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libfrontend_a.all_cpp.final; \
-	done; \
-	cat libfrontend_a.all_cpp.final libfrontend_a.all_cpp.files > libfrontend_a.all_cpp.cpp; \
-	rm -f libfrontend_a.all_cpp.final libfrontend_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libfrontend_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libfrontend_a_OBJECTS="$(libfrontend_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/frontend/btinstallmgr.cpp b/bibletime/frontend/btinstallmgr.cpp
deleted file mode 100644
index 8e11278..0000000
--- a/bibletime/frontend/btinstallmgr.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-/***************************************************************************
-                          btinstallmgr.cpp  -  description
-                             -------------------
-    begin                : Mit Sep 24 2003
-    copyright            : (C) 2003 by The BibleTime team
-    email                : info@bibletime.info
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "btinstallmgr.h"
-#include "util/cpointers.h"
-
-#include <qfile.h>
-#include <qfileinfo.h>
-
-#include <kapplication.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
-
-#include <filemgr.h>
-#include <swconfig.h>
-#include <swbuf.h>
-#include <map>
-#include <utility>
-
-using namespace sword;
-
-const QString BTInstallMgr::Tool::LocalConfig::swordConfigFilename() {
-//  Q_ASSERT( CPointers::backend()->sysconfig );
-	return QString::fromLatin1("%1/.sword/sword.conf").arg(getenv("HOME"));
-}
-
-QStringList BTInstallMgr::Tool::RemoteConfig::sourceList( sword::InstallMgr* mgr ) {
-//  qWarning("BTInstallMgr::Tool::sourceList( sword::InstallMgr* mgr )");
-  Q_ASSERT(mgr);
-  Q_ASSERT(mgr->installConf);
-
-  QStringList names;
-
-  //add Sword remote sources
-	for (InstallSourceMap::iterator it = mgr->sources.begin(); it != mgr->sources.end(); it++)
-	{
-    names << QString::fromLocal8Bit(it->second->caption);
-  }
-
-  // Add local directory sources
-  SWConfig config(Tool::RemoteConfig::configFilename().latin1());
-  sword::SectionMap::iterator sourcesSection = config.Sections.find("Sources");
-	if (sourcesSection != config.Sections.end()) {
-		sword::ConfigEntMap::iterator sourceBegin = sourcesSection->second.lower_bound("DIRSource");
-		sword::ConfigEntMap::iterator sourceEnd = sourcesSection->second.upper_bound("DIRSource");
-
-		while (sourceBegin != sourceEnd) {
-			InstallSource is("DIR", sourceBegin->second.c_str());
-      names << QString::fromLatin1(is.caption.c_str());
-
-      sourceBegin++;
-		}
-	}
-
-  return names;
-}
-
-QStringList BTInstallMgr::Tool::LocalConfig::targetList() {
-  QStringList names = CPointers::backend()->swordDirList();
-  return names;
-}
-
-void BTInstallMgr::Tool::LocalConfig::setTargetList( const QStringList& targets ) {
-  //saves a new Sworc config using the provided target list
-  QString filename = KGlobal::dirs()->saveLocation("data", "bibletime/") + "sword.conf"; //default is to assume the real location isn't writable
-  bool directAccess = false;
-
-  QFileInfo i(LocalConfig::swordConfigFilename());
-	QFileInfo dirInfo(i.dirPath(true));
-
-  if ( i.exists() && i.isWritable() ) { //we can write to the file ourself
-    filename = LocalConfig::swordConfigFilename();
-    directAccess = true;
- 	}
-	else if ( !i.exists() && dirInfo.isWritable() ) { // if the file doesn't exist but th eparent is writable for us, create it
-    filename = LocalConfig::swordConfigFilename();
-    directAccess = true;
-	}
-
-  bool setDataPath = false;
-  SWConfig conf(filename.local8Bit());
-  conf.Sections.clear();
-
-  for (QStringList::const_iterator it = targets.begin(); it != targets.end(); ++it) {
-    QString t = *it;
-    if (t.contains( QString::fromLatin1("%1/.sword").arg(getenv("HOME")) )) {
-      //we don't want HOME/.sword in the config
-      continue;
-    }
-    else {
-//      conf["Install"][!setDataPath ? "DataPath" : "AugmentPath"] = t.local8Bit();
-	    conf["Install"].insert( std::make_pair(!setDataPath ? "DataPath" : "AugmentPath", t.local8Bit()) );
-
-      setDataPath = true;
-    }
-  }
-  conf.Save();
-
-  if (!directAccess) { //use kdesu to move the file to the right place
-   KProcess *proc = new KProcess;
-   *proc << "kdesu";
-   *proc << QString::fromLatin1("-c") << QString("mv %1 %2").arg(filename).arg(LocalConfig::swordConfigFilename());
-//   KApplication::connect(proc, SIGNAL(processExited(KProcess *)),
-//      this, SLOT(slot_swordConfigWritten(KProcess *)));
-   proc->start(KProcess::Block);
-  }
-}
-
-sword::InstallSource BTInstallMgr::Tool::RemoteConfig::source( sword::InstallMgr* mgr, const QString& name ) {
-  Q_ASSERT(mgr);
-
-  InstallSourceMap::iterator source = mgr->sources.find(name.latin1());
-  if (source != mgr->sources.end()) {
-  	return *(source->second);
-  }
-  else { //not found in Sword, may be a local DIR source
-		SWConfig config(Tool::RemoteConfig::configFilename().latin1());
-		SectionMap::iterator sourcesSection = config.Sections.find("Sources");
-		if (sourcesSection != config.Sections.end()) {
-			ConfigEntMap::iterator sourceBegin =
-					sourcesSection->second.lower_bound("DIRSource");
-			ConfigEntMap::iterator sourceEnd =
-					sourcesSection->second.upper_bound("DIRSource");
-
-			while (sourceBegin != sourceEnd) {
-      	InstallSource is("DIR", sourceBegin->second.c_str());
-        if (!strcmp(is.caption, name.latin1()) ) { //found local dir source
-        	return is;
-				}
-
-				sourceBegin++;//next source
-			}
-		}
-  }
-
-	InstallSource is("EMPTY");   //default return value
-	is.caption = "unknown caption";
-	is.source = "unknown source";
-	is.directory = "unknown dir";
-	
-	return is;
-}
-
-const bool BTInstallMgr::Tool::RemoteConfig::isRemoteSource( sword::InstallSource* is ) {
-  Q_ASSERT(is);
-  if (is)
-    return !strcmp(is->type, "FTP");
-  else
-    return false;
-}
-
-void BTInstallMgr::Tool::RemoteConfig::addSource( sword::InstallSource* is ) {
-  if (!is) {
-    return;
-  }
-
-  SWConfig config(Tool::RemoteConfig::configFilename().latin1());
-  if (!strcmp(is->type, "FTP")) {
-		//make sure the path doesn't have a trailing slash, sword doesn't like it
-		if (is->directory[ is->directory.length()-1 ] == '/') {
-			is->directory--; //make one char shorter
-		}
-
-    config["Sources"].insert( std::make_pair("FTPSource", is->getConfEnt()) );
-  }
-  else if (!strcmp(is->type, "DIR")) {
-    config["Sources"].insert( std::make_pair("DIRSource", is->getConfEnt()) );
-  }
-  config.Save();
-}
-
-void BTInstallMgr::Tool::RemoteConfig::initConfig() {
-  //Do only continue if the config does not yet exist...
-  if (QFile::exists(configFilename())) {
-    return;
-  }
-
-  QFile::remove(configFilename());
-
-//remote sources will be setup by the manage sources dialog
-
-	SWConfig config(Tool::RemoteConfig::configFilename().latin1());
-  config["General"]["PassiveFTP"] = "true";
-	config.Save();
-}
-
-const QString BTInstallMgr::Tool::RemoteConfig::configPath() {
-	const char *envhomedir  = getenv("HOME");
-	QString confPath = QString::fromLatin1((envhomedir) ? envhomedir : ".");
-	confPath += QString::fromLatin1("/.sword/InstallMgr");
-
-  return confPath;
-}
-
-const QString BTInstallMgr::Tool::RemoteConfig::configFilename() {
-  return (configPath() + "/InstallMgr.conf").latin1();
-}
-
-void BTInstallMgr::Tool::RemoteConfig::removeSource( sword::InstallMgr* mgr, sword::InstallSource* is) {
-  Q_ASSERT(mgr);
-  Q_ASSERT(is);
-
-}
-
-void BTInstallMgr::Tool::RemoteConfig::resetRemoteSources() {
-  SWConfig config(Tool::RemoteConfig::configFilename().latin1());
-  config["Sources"].erase( //remove all FTP sources
-		config["Sources"].lower_bound("FTPSource"),
-		config["Sources"].upper_bound("FTPSource")
-	);
-	config.Save();
-}
-
-void BTInstallMgr::Tool::RemoteConfig::resetLocalSources() {
-  SWConfig config(Tool::RemoteConfig::configFilename().latin1());
-  config["Sources"].erase( //remove all FTP sources
-		config["Sources"].lower_bound("DIRSource"),
-		config["Sources"].upper_bound("DIRSource")
-	);
-	config.Save();
-}
-
-CSwordBackend* BTInstallMgr::Tool::backend( sword::InstallSource* const is) {
-  if (!is)
-    return 0;
-
-  CSwordBackend* ret = 0;
-  if (RemoteConfig::isRemoteSource(is)) {
-    ret = new CSwordBackend( QString::fromLatin1(is->localShadow.c_str()) );
-	}
-  else {
-//		qWarning("constructing a backend in %s", is->directory.c_str());
-    ret = new CSwordBackend( QString::fromLatin1(is->directory.c_str()) );
-	}
-
-	if (ret) {
-    ret->initModules();
-	}
-
-  return ret;
-}
-
-
-
-BTInstallMgr::BTInstallMgr() : InstallMgr(Tool::RemoteConfig::configPath().latin1()) {
-}
-
-BTInstallMgr::~BTInstallMgr(){
-}
-
-void BTInstallMgr::statusUpdate(double dltotal, double dlnow) {
-	//qWarning("total: %d; now: %d", dltotal, dlnow);
-  int totalPercent = (int)((float)(dlnow + m_completedBytes+1) / (float)(m_totalBytes) * 100);
-
-	if (totalPercent > 100) {
-		totalPercent = 100;
-	}
-	else if (totalPercent < 0) {
-		totalPercent = 0;
-	}
-
-  int filePercent  = (int)((float)(dlnow + 1) / (float)(dltotal) * 100);
-	if (filePercent > 100) {
-		filePercent = 100;
-	}
-	else if (filePercent < 0) {
-		filePercent = 0;
-	}
-
-  emit completed(totalPercent, filePercent);
-  KApplication::kApplication()->processEvents();
-}
-
-void BTInstallMgr::preDownloadStatus(long totalBytes, long completedBytes, const char*) {
-  emit downloadStarted( "unkown filename" );
-
-	m_completedBytes = completedBytes;
-  m_totalBytes = totalBytes;
-  KApplication::kApplication()->processEvents();
-}
diff --git a/bibletime/frontend/btinstallmgr.h b/bibletime/frontend/btinstallmgr.h
deleted file mode 100644
index 5f7debb..0000000
--- a/bibletime/frontend/btinstallmgr.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/***************************************************************************
-                          btinstallmgr.h  -  description
-                             -------------------
-    begin                : Mit Sep 24 2003
-    copyright            : (C) 2003 by The BibleTime team
-    email                : info@bibletime.info
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef BTINSTALLMGR_H
-#define BTINSTALLMGR_H
-
-
-//BibleTIme includes
-#include "backend/cswordbackend.h"
-
-
-//sword includes
-#include <installmgr.h>
-
-//Qt includes
-#include <qobject.h>
-#include <qptrlist.h>
-#include <qstring.h>
-#include <qstringlist.h>
-
-typedef QPtrList<sword::InstallSource> InstallSourceList;
-
-/**Our own reimplementation to provide status bar updates.
-  *@author The BibleTime team
-  */  
-class BTInstallMgr : public QObject, public sword::InstallMgr {
-  Q_OBJECT
-public:
-  class Tool {
-  public:
-    class LocalConfig {
-    public:
-      static const QString swordConfigFilename();
-      static QStringList targetList();
-      static void setTargetList( const QStringList& );      
-    private:
-      LocalConfig() {};
-    };
-
-    class RemoteConfig {
-    public:
-      static void initConfig();
-      static const QString configPath();
-      static const QString configFilename();
-
-			static void resetRemoteSources();
-			static void resetLocalSources();
-
-      static QStringList sourceList( sword::InstallMgr* );
-      static sword::InstallSource source( sword::InstallMgr*, const QString& name );
-      static const bool isRemoteSource( sword::InstallSource* is );
-      static void addSource( sword::InstallSource* );
-      static void removeSource( sword::InstallMgr*, sword::InstallSource* );
-
-
-    private:
-      RemoteConfig() {};
-    };
-
-    static CSwordBackend* backend( sword::InstallSource* const );
-
-  private:
-    Tool() {};    
-  };
-
-	BTInstallMgr();
-	virtual ~BTInstallMgr();
-
-protected:
-  virtual void statusUpdate(double dltotal, double dlnow);
-	virtual void preDownloadStatus(long totalBytes, long completedBytes, const char *message);
-
-  long m_totalBytes;
-  long m_completedBytes;
-  
-signals: // Signals
-  void completed( const int, const int );
-  /**
-  * Emitted when a new file gets downloaded.
-  */
-  void downloadStarted( const QString& );
-};
-
-#endif
diff --git a/bibletime/frontend/cbtconfig.cpp b/bibletime/frontend/cbtconfig.cpp
deleted file mode 100644
index 9df717b..0000000
--- a/bibletime/frontend/cbtconfig.cpp
+++ /dev/null
@@ -1,536 +0,0 @@
-/***************************************************************************
-                          cbtconfig.cpp  -  description
-                             -------------------
-    begin                : Mon Nov 19 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cbtconfig.h"
-#include "backend/cswordmoduleinfo.h"
-#include "util/cpointers.h"
-
-
-//Qt includes
-#include <qapplication.h>
-#include <qfontdatabase.h>
-#include <qstring.h>
-#include <qstringlist.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kcharsets.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kaccel.h>
-
-
-/* 	No constructor and destructor, because this class only contains static methods.
-		It won't be instantiated. */
-
-const QString CBTConfig::getKey( const CBTConfig::strings ID){
-	switch ( ID ){
-		case bibletimeVersion:			        return "bibletimeVersion";
-		case language: 							        return "language";
-		case standardBible: 				        return "standardBible";
-		case standardCommentary: 		        return "standardCommentary";
-		case standardLexicon: 			        return "standardLexicon";
-		case standardDailyDevotional:	      return "standardDailyDevotional";    
-		case standardHebrewStrongsLexicon: 	return "standardHebrewLexicon";
-		case standardGreekStrongsLexicon: 	return "standardGreekLexicon";
-		case standardHebrewMorphLexicon:	  return "standardHebrewMorphLexicon";
-		case standardGreekMorphLexicon:		  return "standardGreekMorphLexicon";
-	}
-	return QString::null;
-}
-
-const QString CBTConfig::getDefault( const CBTConfig::strings ID){
-	switch ( ID ){
-		case bibletimeVersion:			return ( "NOT YET INSTALLED" );
-		// main() will realize this and set the value to VERSION
-		case language: 							return (KGlobal::locale()->language()).local8Bit();
-		case standardBible: 				return "KJV";  // no effect
-		case standardCommentary: 		return "MHC";
-		case standardLexicon: 			return "ISBE";
-		case standardDailyDevotional: 			return ""; //no default
-		case standardHebrewStrongsLexicon:  return "StrongsHebrew";
-		case standardGreekStrongsLexicon: 	return "StrongsGreek";
-		case standardHebrewMorphLexicon:	  return "StrongsHebrew"; //warning this is wrong
-		case standardGreekMorphLexicon:		  return "StrongsGreek";  //but imo has no effect
-	}
-	return QString::null;
-}
-
-const QString CBTConfig::getKey( const CBTConfig::bools ID){
-	switch ( ID ){
-		case firstSearchDialog:		return "firstSearchDialog";
-		case readOldBookmarks:		return "readOldBookmarks";
-
-		case toolbar:							return "toolbar";
-		case mainIndex:						return "mainIndex";
-
-		case autoTile:						return "autoTile";
-		case autoCascade:					return "autoCascade";
-
-		case lexiconCache: 				return "lexicon_chache";
-
-		case lineBreaks: 					return "lineBreaks";
-		case verseNumbers: 				return "verseNumbers";
-		case scroll:			 				return "scroll";
-
-		case tips: 								return "RunOnStart";
-		case logo: 								return "logo";
-		case restoreWorkspace: 		return "restoreWorkspace";
-		case crashedLastTime: 		return "crashedLastTime";
-		case crashedTwoTimes: 		return "crashedTwoTimes";
-	}
-	return QString::null;	
-}
-
-const QString CBTConfig::getKey( const CBTConfig::ints ID){
-	switch ( ID ){
-		case footnotes: 					return "footnotes";
-		case strongNumbers:  			return "strongNumbers";
-  	case headings: 						return "headings";
-  	case morphTags: 					return "morphTags";
-		case lemmas: 							return "lemmas";
-		case hebrewPoints: 				return "hebrewPoints";
-		case hebrewCantillation: 	return "hebrewCantillation";
-		case greekAccents: 				return "greekAccents";
-		case textualVariants:			return "textualVariants";
-    case transliteration:     return "transliteration";
-    case scriptureReferences: return "scriptureReferences";
-  }
-  return QString::null;
-}
-
-const bool CBTConfig::getDefault( const CBTConfig::bools ID){
-	switch ( ID ){
-		case firstSearchDialog:		return true;
-    case readOldBookmarks:    return false;
-
-		case toolbar:							return true;
-		case mainIndex:						return true;
-
-		case autoTile:						return true;
-		case autoCascade:					return false;
-
-		case lexiconCache: 				return true;
-
-		case lineBreaks: 					return false;
-		case verseNumbers: 				return true;
-		case scroll:			 				return true;
-
-		case tips: 								return true;
-		case logo: 								return true;
-		case restoreWorkspace: 		return true;
-		case crashedLastTime: 		return false;
-		case crashedTwoTimes: 		return false;    
-	}
-	return false;
-}
-
-const int CBTConfig::getDefault( const CBTConfig::ints ID){
-	switch ( ID ){
-		case footnotes: 					return true;
-		case strongNumbers:  			return false;
-  	case headings: 						return true;
-  	case morphTags: 					return false;
-		case lemmas: 							return false;
-		case hebrewPoints: 				return true;
-		case hebrewCantillation: 	return true;
-		case greekAccents: 				return true;
-		case textualVariants:			return false;
-    case transliteration:     return 0;
-    case scriptureReferences:	return true;
-  }
-  return 0;
-}
-
-const QString CBTConfig::getKey( const CBTConfig::colors ID){
-	switch ( ID ){
-		case textColor: 							return "textColor";
-		case backgroundColor: 				return "backgroundColor";
-		case background2Color: 				return "background2Color";
-		case highlightedVerseColor: 	return "highlightedVerseClolor";
-		case footnotesColor: 					return "footnotesColor";
-		case strongsColor: 						return "strongsColor";
-		case morphsColor: 						return "morphsColor";
-		case jesuswordsColor: 				return "jesuswordsColor";
-		case swordRefColor: 					return "swordRefColor";
-	}
-	return QString::null;
-}
-
-const QColor CBTConfig::getDefault( const CBTConfig::colors ID){
-	switch ( ID ){
-		case textColor: 							return QColor(Qt::black);
-		case backgroundColor: 				return QColor(QString::fromLatin1("#fffaee"));
-		case background2Color: 				return QColor(QString::fromLatin1("#f1f1f1"));
-		case highlightedVerseColor:		return QColor(Qt::red);
-		case footnotesColor: 					return QColor(QString::fromLatin1("#515151"));
-		case strongsColor: 						return QColor(Qt::darkBlue);
-		case morphsColor: 						return QColor(Qt::darkBlue);
-		case jesuswordsColor: 				return QColor(QString::fromLatin1("#ad0000"));
-		case swordRefColor: 					return QColor(Qt::blue);
-	}
-	return Qt::blue;
-}
-
-const QString CBTConfig::getKey( const CBTConfig::intLists ID){
-	switch ( ID ){
-		case splitterSizes: return "splitterSizes";
-	}
-	return QString::null;
-}
-
-const QValueList<int> CBTConfig::getDefault( const CBTConfig::intLists ID){
-	switch ( ID ){
-		case splitterSizes: return QValueList<int>();
-	}
-	return QValueList<int>();
-}
-
-const QString CBTConfig::getKey( const CBTConfig::stringLists ID){
-	switch ( ID ){
-		case searchCompletionTexts:
-      return QString::fromLatin1("searchCompletionTexts");
-		case searchTexts:
-      return QString::fromLatin1("searchTexts");
-	}
-	return QString::null;
-}
-
-const QStringList CBTConfig::getDefault( const CBTConfig::stringLists ID){
-	switch ( ID ){
-		case searchTexts: {
-      QStringList list;
-      list.append(QString::null);
-			return list;
-    }
-		case searchCompletionTexts:
-			return QStringList();
-	}
-	return QStringList();
-}
-
-const QString CBTConfig::getKey( const CBTConfig::stringMaps ID) {
-	switch (ID) {
-    case searchScopes:
-      return QString::fromLatin1("SearchScopes");
-  };
-	return QString::null;
-}
-
-const CBTConfig::StringMap CBTConfig::getDefault( const CBTConfig::stringMaps ID){
-	switch ( ID ){
-    case searchScopes: {
-      CBTConfig::StringMap map;
-      map.insert(i18n("Old testament"),         QString::fromLatin1("Gen - Mal"));
-  	  map.insert(i18n("Moses/Pentateuch/Torah"),QString::fromLatin1("Gen - Deut"));
-  	  map.insert(i18n("History"),               QString::fromLatin1("Jos - Est"));
-  	  map.insert(i18n("Prophets"),              QString::fromLatin1("Isa - Mal"));
-   	  map.insert(i18n("New testament"),         QString::fromLatin1("Mat - Rev"));
-  	  map.insert(i18n("Gospels"), 		          QString::fromLatin1("Mat - Joh"));
-  	  map.insert(i18n("Letters/Epistles"), 	    QString::fromLatin1("Rom - Jude"));
-  	  map.insert(i18n("Paul's Epistles"), 	    QString::fromLatin1("Rom - Phile"));
-
-      //make the list to the current bookname language!
-      CBTConfig::StringMap::Iterator it;
-      sword::VerseKey vk;
-      vk.setLocale("en");
-      
-      for (it = map.begin(); it != map.end(); ++it) {
-        sword::ListKey list = vk.ParseVerseList(it.data().local8Bit(), "Genesis 1:1", true);
-        QString data;
-        for (int i = 0; i < list.Count(); ++i) {
-          data += QString::fromLocal8Bit(list.GetElement(i)->getRangeText()) + "; ";
-     	  }
-        map[it.key()] = data; //set the new data
-      };      
-
-      return map;
-    };
-    default:
-      return CBTConfig::StringMap();
-	}
-	return CBTConfig::StringMap();
-}
-
-
-const QString CBTConfig::getKey( const CLanguageMgr::Language& language ){
-	return language.name();
-}
-
-const QFont CBTConfig::getDefault( const CLanguageMgr::Language& /*language*/ ){
-  //language specific lookup of the font name
-  return KApplication::font();
-}
-
-
-const QString CBTConfig::get( const CBTConfig::strings ID){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "strings");
-	return config->readEntry(getKey(ID),getDefault(ID));
-}
-
-const bool CBTConfig::get( const CBTConfig::bools ID){
-	//special behaviour for the KTipDialog class
-	KConfig* config = KGlobal::config();	
-	KConfigGroupSaver groupSaver(config, (ID == CBTConfig::tips) ? "TipOfDay" : "bools");
-	return config->readBoolEntry(getKey(ID),getDefault(ID));
-}
-
-const int CBTConfig::get( const CBTConfig::ints ID){
-	KConfig* config = KGlobal::config();	
-	KConfigGroupSaver groupSaver(config, "ints");		
-	return config->readBoolEntry(getKey(ID), getDefault(ID));
-}
-
-
-const QColor CBTConfig::get( const CBTConfig::colors ID){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "colors");
-	QColor defaultColor = getDefault(ID);
-	return config->readColorEntry(getKey(ID),&defaultColor);
-}
-
-const QValueList<int> CBTConfig::get( const CBTConfig::intLists ID ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "lists");
-	return config->readIntListEntry(getKey(ID));
-}
-
-const QStringList	CBTConfig::get( const CBTConfig::stringLists ID ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "stringlists");
-	return config->readListEntry(getKey(ID));
-}
-
-const CBTConfig::StringMap CBTConfig::get( const CBTConfig::stringMaps ID ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, getKey(ID));
-
-  if (config->hasGroup(getKey(ID))) {
-	  CBTConfig::StringMap map = config->entryMap(getKey(ID));
-    switch (ID) {
-      case searchScopes: { //make sure we return the scopes in the chosen language. saved keys are in english
-        CBTConfig::StringMap::Iterator it;
-        sword::VerseKey vk;
-
-        for (it = map.begin(); it != map.end(); ++it) {
-          sword::ListKey list = vk.ParseVerseList(it.data().local8Bit(), "Genesis 1:1", true);
-          QString data;
-          for (int i = 0; i < list.Count(); ++i) {
-            data += QString::fromLocal8Bit(list.GetElement(i)->getRangeText()) + "; ";
-       	  }
-          map[it.key()] = data; //set the new data
-        };
-        return map;
-      }
-      default:
-        return getDefault(ID);
-    }
-  }
-  return getDefault(ID);
-}
-
-const CBTConfig::FontSettingsPair	CBTConfig::get( const CLanguageMgr::Language& language ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "font standard settings");
-
-  FontSettingsPair settings;
-  settings.first = config->readBoolEntry(getKey(language));
-
-  config->setGroup("fonts");
- 
-  settings.second = settings.first ? config->readFontEntry(getKey(language)) : KApplication::font();
-
-  return settings;
-}
-
-void CBTConfig::set( const CBTConfig::strings ID, const QString value ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "strings");
-	config->writeEntry(getKey(ID), value);
-}
-
-void CBTConfig::set(const  CBTConfig::bools ID,const  bool value ){
-	KConfig* config = KGlobal::config();
-	//special behaviour to work with KTipDialog class of KDE
-	KConfigGroupSaver groupSaver(config, (ID == CBTConfig::tips) ? "TipOfDay" : "bools");
-	config->writeEntry(getKey(ID), value);
-}
-
-void CBTConfig::set(const CBTConfig::ints ID, const int value ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "ints");
-	config->writeEntry(getKey(ID), value);
-}
-
-void CBTConfig::set( const CBTConfig::colors ID, const QColor value ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "colors");
-	config->writeEntry(getKey(ID), value);
-}
-
-void CBTConfig::set( const CBTConfig::intLists ID, const QValueList<int> value ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "lists");
-	config->writeEntry(getKey(ID), value);
-}
-
-void CBTConfig::set( const CBTConfig::stringLists ID, const QStringList value ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, "stringlists");
-	config->writeEntry(getKey(ID), value);
-}
-
-void CBTConfig::set( const CBTConfig::stringMaps ID, const CBTConfig::StringMap value ){
-	KConfig* config = KGlobal::config();
-	KConfigGroupSaver groupSaver(config, getKey(ID));  
-  config->deleteGroup(getKey(ID)); //make sure we only save the new entries and don't use old ones
-  config->sync();  
-  config->setGroup(getKey(ID));
-  
-  switch (ID) {
-    case searchScopes: {
-      /**
-      * We want to make sure that the search scopes are saved with english key names so loading them
-      * will always work with each locale set.
-      */
-      CBTConfig::StringMap::ConstIterator it;
-      QString data = QString::null;
-
-      sword::VerseKey vk;
-      for (it = value.begin(); it != value.end(); ++it) {
-        sword::ListKey list = vk.ParseVerseList(it.data().local8Bit(), "Genesis 1:1", true);
-        data = QString::null;
-        for (int i = 0; i < list.Count(); ++i) {
-          if ( sword::VerseKey* range = dynamic_cast<sword::VerseKey*>(list.GetElement(i)) ) {
-            range->setLocale("en");
-            data += QString::fromLocal8Bit( range->getRangeText() ) + ";";
-          }
-        }
-        config->writeEntry(it.key(), data);
-      }
-      break;
-    }
-    default: {
-      for (CBTConfig::StringMap::ConstIterator it = value.begin(); it != value.end(); ++it) {
-        config->writeEntry(it.key(), it.data());
-      }
-      break;
-    }
-  };
-}
-
-
-void CBTConfig::set( const CLanguageMgr::Language& language, const FontSettingsPair& value ){
-	KConfig* config = KGlobal::config();
-
-  KConfigGroupSaver groupSaver(config, "fonts");
-	config->writeEntry(getKey(language), value.second);
-  
-  config->setGroup("font standard settings");  
-	config->writeEntry(getKey(language), value.first);
-}
-
-
-const CSwordBackend::DisplayOptions CBTConfig::getDisplayOptionDefaults(){
-  CSwordBackend::DisplayOptions options;
-
-	options.lineBreaks   = 	get(CBTConfig::lineBreaks);
-  options.verseNumbers = 	get(CBTConfig::verseNumbers);
-
-	return options;
-}
-
-const CSwordBackend::FilterOptions CBTConfig::getFilterOptionDefaults(){
-
-  CSwordBackend::FilterOptions options;
-
-  options.footnotes =						get(CBTConfig::footnotes);
-  options.strongNumbers = 			get(CBTConfig::strongNumbers);
-  options.headings = 						get(CBTConfig::headings);
-  options.morphTags = 					get(CBTConfig::morphTags);
-  options.lemmas = 							get(CBTConfig::lemmas);
-  options.hebrewPoints = 				get(CBTConfig::hebrewPoints);
-  options.hebrewCantillation = 	get(CBTConfig::hebrewCantillation);
-  options.greekAccents = 				get(CBTConfig::greekAccents);
-  options.textualVariants = 		get(CBTConfig::textualVariants);
-  options.transliteration = 		get(CBTConfig::transliteration);
-  options.scriptureReferences = get(CBTConfig::scriptureReferences);
-
-	return options;
-}
-
-void CBTConfig::setupAccel(const CBTConfig::keys type, KAccel* const accel) {
-//	KConfig* config = KGlobal::config();	
-	
-	switch (type) {
-		case writeWindow : {
-			accel->setConfigGroup("Writewindow shortcuts");
-			break;
-		};
-		case readWindow : {
-			accel->setConfigGroup("Readwindow shortcuts");
-			break;
-		};
-		case bookWindow : {
-			accel->setConfigGroup("Book shortcuts");
-			break;
-		};
-		case bibleWindow : {
-			accel->setConfigGroup("Bible shortcuts");
-			break;
-		};
-		case commentaryWindow : {
-			accel->setConfigGroup("Commentary shortcuts");
-			break;
-		};
-		case lexiconWindow : {
-			accel->setConfigGroup("Lexicon shortcuts");					
-			break;
-		};
-		case application : {
-			accel->setConfigGroup("Application shortcuts");				
-			break;
-		};
-	};
-}
-
-const QString CBTConfig::getModuleEncryptionKey( const QString& module ) {
-	KConfig* config = KGlobal::config();
-  KConfigGroupSaver groupSaver(config, "Module keys");
-
-  return config->readEntry(module, QString::null);
-}
-  
-void CBTConfig::setModuleEncryptionKey( const QString& module, const QString& key ) {
-//  if (CSwordModuleInfo* const mod = CPointers::backend()->findModuleByName(module) ) {
-//    // if an empty key is set for an unencrypted module do nothing
-//    if (key.isEmpty() && !mod->isEncrypted()) {
-//      return;
-//    }
-//  }
-//  else if (key.isEmpty()) {
-//    return;
-//  };
-  
-  KConfig* config = KGlobal::config();
-  KConfigGroupSaver groupSaver(config, "Module keys");
-
-  config->writeEntry(module, key);
-};
diff --git a/bibletime/frontend/cbtconfig.h b/bibletime/frontend/cbtconfig.h
deleted file mode 100644
index d55ac33..0000000
--- a/bibletime/frontend/cbtconfig.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/***************************************************************************
-                          cbtconfig.h  -  description
-                             -------------------
-    begin                : Mon Nov 19 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBTCONFIG_H
-#define CBTCONFIG_H
-
-#include <qstring.h>
-#include <qcolor.h>
-#include <qfont.h>
-#include <qvaluelist.h>
-#include <qmap.h>
-
-#include "backend/cswordbackend.h"
-#include "backend/clanguagemgr.h"
-
-//Forward declarations
-class KAccel;
-
-/**
- * This class is the interface to the config object of BibleTime
- * @author The BibleTime team
- */
-class CBTConfig {
-public:
-  typedef QMap<QString, QString> StringMap;
-	enum strings {
-		bibletimeVersion,
-		language,
-		standardBible,
-		standardCommentary,
-		standardLexicon,
-		standardDailyDevotional,    
-		standardHebrewStrongsLexicon,
-		standardGreekStrongsLexicon,
-		standardHebrewMorphLexicon,
-		standardGreekMorphLexicon
-	};
-//	enum fonts {
-//		standard,
-//		unicode
-//	};
-	enum colors {
-		textColor,
-		backgroundColor,
-		background2Color,
-		highlightedVerseColor,
-		footnotesColor,
-		strongsColor,
-		morphsColor,
-		jesuswordsColor,
-		swordRefColor  //SWORD hyperlink
-	};
-	enum bools {
-		firstSearchDialog,
-    readOldBookmarks,
-
-		toolbar,
-		mainIndex,
-
-		autoTile,
-		autoCascade,
-
-		lexiconCache,
-
-		lineBreaks,
-		verseNumbers,
-		scroll,
-
-		tips,
-		logo,
-		restoreWorkspace,
-    crashedLastTime,
-    crashedTwoTimes
-	};
-	enum ints {
-  	footnotes,
-  	strongNumbers,
-  	headings,
-  	morphTags,
-		lemmas,
-		hebrewPoints,
-		hebrewCantillation,
-		greekAccents,
-		textualVariants,
-    transliteration,
-    scriptureReferences
-  };
-  enum intLists {
-		splitterSizes
-	};
-	enum stringLists {
-		searchCompletionTexts,
-		searchTexts
-	};
-	enum keys {		
-	  readWindow,		
-		writeWindow,		
-	  bookWindow,
-		bibleWindow,
-		commentaryWindow,
-		lexiconWindow,
-		application
-	};
-  enum stringMaps {
-    searchScopes
-  };
-  typedef std::pair<bool, QFont> FontSettingsPair;
-  
-  static const QString 		get( const CBTConfig::strings );
-  static const bool 			get( const CBTConfig::bools );
-  static const int   			get( const CBTConfig::ints );
-  static const QColor 		get( const CBTConfig::colors );
-  static const QValueList<int>	get( const CBTConfig::intLists );
-  static const QStringList	get( const CBTConfig::stringLists );
-  static const CBTConfig::StringMap	get( const CBTConfig::stringMaps );
-
-  static const FontSettingsPair	get( const CLanguageMgr::Language& );
-	
-	static const QString 				 getDefault( const CBTConfig::strings );
-	static const bool		 				 getDefault( const CBTConfig::bools );
-	static const int		 				 getDefault( const CBTConfig::ints );
-	static const QColor	 				 getDefault( const CBTConfig::colors );
-	static const QValueList<int> getDefault( const CBTConfig::intLists );
-	static const QStringList		 getDefault( const CBTConfig::stringLists );
-	static const CBTConfig::StringMap  		 getDefault( const CBTConfig::stringMaps );
-  static const QFont 		       getDefault( const CLanguageMgr::Language& );
-    
-	static void set( const CBTConfig::strings, 	const QString value );
-	static void set( const CBTConfig::bools, 		const bool value );
-	static void set( const CBTConfig::ints, 		const int value );
-	static void set( const CBTConfig::colors, 	const QColor value );
-	static void set( const CBTConfig::intLists,	const QValueList<int> value );
-  static void set( const CBTConfig::stringLists, const QStringList value);
-  static void set( const CBTConfig::stringMaps, const CBTConfig::StringMap value);
-  static void	set( const CLanguageMgr::Language& language, const FontSettingsPair& fontSettings );    
-
-  static const CSwordBackend::FilterOptions getFilterOptionDefaults();
-  static const CSwordBackend::DisplayOptions getDisplayOptionDefaults();
-  static void setupAccel(const CBTConfig::keys type, KAccel* const accel);
-
-  static const QString getModuleEncryptionKey( const QString& name );
-  static void setModuleEncryptionKey( const QString& name, const QString& key );
-  
-private:
-	static const QString getKey( const CBTConfig::strings );
-	static const QString getKey( const CBTConfig::bools );
-	static const QString getKey( const CBTConfig::ints );
-	static const QString getKey( const CBTConfig::colors );
-	static const QString getKey( const CBTConfig::intLists );
-	static const QString getKey( const CBTConfig::stringLists );
-	static const QString getKey( const CBTConfig::stringMaps );
-	static const QString getKey( const CLanguageMgr::Language& );    
-};
-
-
-#endif
diff --git a/bibletime/frontend/cdragdropmgr.cpp b/bibletime/frontend/cdragdropmgr.cpp
deleted file mode 100644
index 6707772..0000000
--- a/bibletime/frontend/cdragdropmgr.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/***************************************************************************
-                          cdragdropdmgr.cpp  -  description
-                             -------------------
-    begin                : Mit Nov 27 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cdragdropmgr.h"
-
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordversekey.h"
-#include "util/cpointers.h"
-
-//Sword includes
-#include "versekey.h"
-
-//Qt includes
-#include <qevent.h>
-#include <qdom.h>
-
-CDragDropMgr::BTDrag::BTDrag( const QString& xml, QWidget* dragSource, const char* name)
-  : QTextDrag(xml, dragSource, name)
-{
-  
-};
-
-//static function to see whether we can decode tje given mime type
-bool CDragDropMgr::BTDrag::canDecode( const QMimeSource * mime ) {
-  if ( mime->provides("BibleTime/DND") ) { //we can decode this type!
-    return true;
-  }
-  return false; //not yet implemented
-};
-
-bool CDragDropMgr::BTDrag::provides( const char* type ) const {
-  return (type == "BibleTime/DND"); //return only true if the type is BibleTime/DND
-};
-
-const char* CDragDropMgr::BTDrag::format( int i ) const {
-  if ( i == 0) { //we support only one format!
-    return "BibleTime/DND";
-  };
-  return 0;
-};
-
-bool CDragDropMgr::BTDrag::decode(const QMimeSource* e, QString& str) {
-  if (canDecode(e)) {
-    str = QString( e->encodedData( "BibleTime/DND" ) );
-    return true;
-  }
-  return false;  
-};
-
-bool CDragDropMgr::BTDrag::decode(const QMimeSource* e, QString& str, QCString& /*subtype*/) {
-  return decode(e, str);
-};
-
-QByteArray CDragDropMgr::BTDrag::encodedData( const char* /*type*/ ) const {
-  return QTextDrag::encodedData("text/plain"); //hack because QTextDrag only accepts text/plainand not our BibleTime/DND type
-};
-
-///////////////////////////// new class //////////////////////
-
-CDragDropMgr::Item::Item( const QString& text )
-  : m_type(Text),
-    m_bookmarkModuleName(QString::null),
-    m_bookmarkKey(QString::null),
-    m_bookmarkDescription(QString::null),
-    m_text(text)
-{
-  
-}
-
-CDragDropMgr::Item::Item( const QString& moduleName, const QString& key, const QString& description  )
-  : m_type(Bookmark),
-    m_bookmarkModuleName(moduleName),
-    m_bookmarkKey(key),
-    m_bookmarkDescription(description),
-    m_text(QString::null)
-{
-  //we have to make sure the key is saved in it's english representation, so we convert it
-  if (CSwordModuleInfo* mod = CPointers::backend()->findModuleByName( moduleName )) {
-    if (mod->type() == CSwordModuleInfo::Bible || mod->type() == CSwordModuleInfo::Commentary) {
-      CSwordVerseKey vk(0);
-      vk.key( key );
-      vk.setLocale("en");
-      
-      m_bookmarkKey = vk.key();
-//      qWarning("english key of %s is %s", key.latin1(), m_bookmarkKey.latin1());
-    }
-  }
-}
-
-CDragDropMgr::Item::~Item(){
-  
-}
-
-const CDragDropMgr::Item::Type& CDragDropMgr::Item::type() const {
-  //returns the type of drag & drop action this item represents
-  return m_type;
-}
-
-/** Returns the text which is used by this DragDrop Item, only valid if type() == Text */
-const QString& CDragDropMgr::Item::text() const {
-//  Q_ASSERT(!m_text.isEmpty()); 
-  return m_text;
-}
-
-/** Returns the key, ony valid if type() == Bookmark */
-const QString& CDragDropMgr::Item::bookmarkKey() const {
-//  Q_ASSERT(!m_bookmarkKey.isEmpty());
-  return m_bookmarkKey;
-}
-
-/** Returns the bookmark module, ony valid if type() == Bookmark */
-const QString& CDragDropMgr::Item::bookmarkModule() const {
-//  Q_ASSERT(!m_bookmarkModuleName.isEmpty());
-  return m_bookmarkModuleName;
-}
-
-/** Returns the bookmark description, ony valid if type() == Bookmark */
-const QString& CDragDropMgr::Item::bookmarkDescription() const {
-//  Q_ASSERT(!m_bookmarkDescription.isEmpty());  
-  return m_bookmarkDescription;
-}
-
-////////////////////////////////// NEW CLASS //////////////////////////
-
-CDragDropMgr::CDragDropMgr(){
-}
-
-CDragDropMgr::~CDragDropMgr(){
-}
-
-const bool CDragDropMgr::canDecode( const QMimeSource* const mime ) {
-  if (CDragDropMgr::BTDrag::canDecode(mime)) {
-    return true;
-  }
-  else if( QTextDrag::canDecode(mime) ) {
-    qWarning("QTextDrag can decode this mime!");
-    return true;
-  };
-  return false;
-};
-
-QDragObject* const CDragDropMgr::dragObject( CDragDropMgr::ItemList& items, QWidget* dragSource ) {
-  if ( items.count() ) {
-    //process the items and set the data to the dragobject we return later
-    QDomDocument doc("DOC");
-    doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-    QDomElement content = doc.createElement("BibleTimeDND");
-    content.setAttribute("syntaxVersion", "1.0");
-    doc.appendChild(content);
-    
-    CDragDropMgr::ItemList::iterator it;
-    for ( it = items.begin(); it != items.end(); ++it ) {
-      Item item = (*it);
-      if (item.type() == Item::Bookmark) { //a bookmark was dragged
-        //append the XML stuff for a bookmark
-        QDomElement bookmark = doc.createElement("BOOKMARK");
-        bookmark.setAttribute("key", item.bookmarkKey());
-        bookmark.setAttribute("description", item.bookmarkDescription());
-        bookmark.setAttribute("moduleName", item.bookmarkModule());
-
-        content.appendChild(bookmark);       
-      }
-      else if (item.type() == Item::Text) { //plain text was dragged
-        //append the XML stuff for plain text
-        QDomElement plainText = doc.createElement("TEXT");
-        plainText.setAttribute("text", item.text());
-
-        content.appendChild(plainText);        
-      }
-    }    
-  
-    BTDrag* dragObject = new BTDrag( doc.toString(), dragSource );
-//    qWarning("DND data created: %s", (const char*)doc.toString().utf8());
-    return dragObject;
-  };
-  return 0;
-};
-
-CDragDropMgr::ItemList CDragDropMgr::decode( const QMimeSource* const  src) {
-  //if the drag was started by another widget which doesn't use CDragDropMgr (a drag created by QTextDrag)
-  if (canDecode(src) && QTextDrag::canDecode(src)) { //if we can decode but it's a QTextDrag and not a BTDrag object
-    QString text;
-    QTextDrag::decode(src, text);
-//    qWarning(text.latin1());
-
-    CDragDropMgr::ItemList dndItems;
-    dndItems.append( Item(text) );
-    return dndItems;
-  }
-  else if (!canDecode(src)){ //if we can't decode it
-    return CDragDropMgr::ItemList();
-  };
-
-  QString xmlData;
-  BTDrag::decode(src, xmlData);
-
-  if (xmlData.isEmpty()) { //something went wrong!
-//    qWarning("CDragDropMgr::decode: empty xml data!");
-    return CDragDropMgr::ItemList();    
-  }
-//  else {
-//    qWarning("Drag&Drop data is: %s", xmlData.latin1());
-//  }
-
-  //we can handle the dropEvent and have xml data to work on!
-  ItemList dndItems;
-
-	QDomDocument doc;
-	doc.setContent( xmlData );
-
-  QDomElement document = doc.documentElement();
-  if( document.tagName() != "BibleTimeDND" ) { //BibleTime was used in syntax version 1.0
-		qWarning("DragDropMgr::decode: Missing BibleTimeDND doc");
-		return CDragDropMgr::ItemList();
-	}
-	// see if there's a section with the name MAINWINDOW
-  QDomElement elem = document.firstChild().toElement();
-  while (!elem.isNull()) {
-  		if (elem.tagName() == "BOOKMARK") { //we found a bookmark!
-//        qWarning("found a bookmark!");
-        const QString key = elem.hasAttribute("key") ? elem.attribute("key") : QString::null;
-        const QString moduleName = elem.hasAttribute("moduleName") ? elem.attribute("moduleName") : QString::null;
-        const QString description = elem.hasAttribute("description") ? elem.attribute("description") : QString::null;
-        
-        dndItems.append( CDragDropMgr::Item(moduleName, key, description) );
-      }
-      else if (elem.tagName() == "TEXT") { //we found a plain text passage!
-        const QString text = elem.hasAttribute("text") ? elem.attribute("text") : QString::null;
-        dndItems.append( CDragDropMgr::Item(text) );
-      };
-      elem = elem.nextSibling().toElement();
-  };
-  
-  return dndItems;
-};
-
-/** Returns which type the given drop event has, if it's a mixed one (both bookmarks and plain text), which shouldn't happen, it return Item::Unknown. */
-CDragDropMgr::Item::Type CDragDropMgr::dndType( const QMimeSource* e ){
-  ItemList dndItems = decode(e);
-  if (dndItems.isEmpty()) {//wrong dropEvent or something strange
-    return Item::Unknown;
-  };
-
-  //check whether all items have the ssame type, if they do return the type
-  //as soon as two items have different types return Item::Unknown
-  ItemList::Iterator it;
-  Item::Type type = Item::Unknown;
-  for( it = dndItems.begin(); it != dndItems.end(); ++it ) {
-    if( type == Item::Unknown) { //if Unknown is set this is the first loop, don't return Unknown
-      type = (*it).type();      
-    }
-    else if (type != (*it).type() ) {//items have different type, return Item::Unknown
-      return Item::Unknown;
-    };
-  };
-  return type;
-}
diff --git a/bibletime/frontend/cdragdropmgr.h b/bibletime/frontend/cdragdropmgr.h
deleted file mode 100644
index 41d01c5..0000000
--- a/bibletime/frontend/cdragdropmgr.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/***************************************************************************
-                          cdragdropdmgr.h  -  description
-                             -------------------
-    begin                : Mit Nov 27 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CDRAGDROPMGR_H
-#define CDRAGDROPMGR_H
-
-//Qt includes
-#include <qstring.h>
-#include <qcstring.h>
-#include <qdragobject.h>
-#include <qvaluelist.h>
-
-//forward declarations
-class QDropEvent;
-class QWidget;
-
-/** This class is the drag'n' drop manager for BibleTime.
- * The dnd is managed by XML code, which defines the type of the drag/drop, the items and the action (moe, copy etc.).
- * It's possible to create the XML code by passing a list of keys etc.
- *
- * Functions:
- *  - dnd_type(), returns either CDragDropMgr::Action_Drag or CDragDropMgr::Action_Drop
- *  - dnd_action(), returns either CDragDropMgr::Move or CDragDropMgr::Copy
- *  - dnd_acceptDrop(), returns true or false. True if the drop could be handled by the CDragDropMgr class, otherwise false
- *
- *
- * The functions which create the XML stuff can't be reimplemented, too. Otherwise we could not guarantee for good XML code
- * which works everywhere.
- *
- * @author The BibleTime team
- */
-class CDragDropMgr  {
-public:
-  //The class which represents one single drag&drop entry (e.g. a bookmark or a portion of text)
-  class Item {
-  public:
-    /**
-    * The possible types of Drag&Drop actions.
-    */
-    enum Type {
-      Bookmark = 0, /* A bookmark: Has a key, a module and a description*/
-      Text, /* Simple text, e.g. can be dropped on a module to start a search in this module using the dropped text */
-      Unknown /* For situatiosn like CDragDropMgr::dndType */
-    };
-    /**
-    * This function returns the type of drag this item has
-    */
-    const CDragDropMgr::Item::Type& type() const;
-    /**
-    * Returns the key, ony valid if type() == Bookmark
-    */
-    const QString& bookmarkKey() const;
-    /**
-    * Returns the module name, ony valid if type() == Bookmark
-    */
-    const QString& bookmarkModule() const;
-    /**
-    * Returns the bookmark description, ony valid if type() == Bookmark
-    */
-    const QString& bookmarkDescription() const;
-    /**
-    * Returns the text which is used by this DragDrop Item, only valid if type() == Text
-    */
-    const QString& text() const;
-
-//  protected:
-    friend class CDragDropMgr;
-    /*
-    * We use protected constructor and destructor because creation of objects
-    * of this class sould only be possible for CDragDropMgr
-    */
-
-    /** Constructor for a text item
-    * This constructor automatically sets the type member to Text
-    * This is also the default constructor
-    */
-    Item(const QString& text = QString::null );
-    /** Constructor for a Bookmark item
-    * This constructor automatically sets the type member to Bookmark
-    */
-    Item(const QString& moduleName, const QString& key, const QString& description);
-    virtual ~Item();
-
-  private:
-    Type m_type; //the member to save the type of the action
-    QString m_bookmarkModuleName; //the modules which is used by this item, only valid for type() == Bookmark
-    QString m_bookmarkKey; //the key of a bookmark, only valid if type() == Bookmark
-    QString m_bookmarkDescription; //the description of a bookmark, only valid if type() == Bookmark    
-    QString m_text; //the text of this item, only valid if type() == Text    
-  }; //end of class CDragDropMgr::Item
-
-  //the item list we're using
-  typedef QValueList<Item> ItemList;
-  
-  /** Return whether the drop should be accepted
-  * This functions tests whether the drop should be accepted or not. It returns true if the drop object
-  * is supported by the CDragDropMgr and if it cotains valid data. Oterwise this function returns false.
-  */
-  static const bool canDecode( const QMimeSource* const mime );
-  /**
-  * This function returns the drag object with the data which represents the items given as parameter
-  * If the list is invalid or empty we return NULL.
-  */
-  static QDragObject* const dragObject( CDragDropMgr::ItemList& items, QWidget* dragSource );
-
-  /**
-  * Decodes the XML stuff we passed to the dragObject at creation time.
-  * Returns a list of CDragDropMgr::Item objects.
-  * If it's a wrong dropEvent we return an empty ist
-  */
-  static CDragDropMgr::ItemList decode( const QMimeSource* const src  ); 
-  /**
-  * Returns which type the given drop event has, if it's a mixed one (both bookmarks and plain text),
-  * which shouldn't happen, it return Item::Unknown.
-  * It also returns Unknown if the drop event is not supported.
-  */
-  static CDragDropMgr::Item::Type dndType( const QMimeSource* e );
-  
-protected:
-  //The class which represents our XML drag object stuff
-  class BTDrag : public QTextDrag {
-  public:
-    BTDrag( const QString& xml, QWidget* dragSource = 0, const char* name = 0);
-    //reimplemented static publoc function to provide functionality for BibleTime XML drags
-    static bool canDecode( const QMimeSource * e );
-    virtual bool provides( const char* type ) const;
-    virtual const char* format( int i = 0 ) const;
-
-    virtual QByteArray encodedData( const char* type ) const;
-    
-  protected:
-    friend class CDragDropMgr;
-    //made protected because the BibleTime classes may not manage the data of BTDrag
-//    virtual void setText(const QString& text);
-
-    //made protected because the BibleTime classes should not manage the DRag&Drop stuff themself
-    static bool decode(const QMimeSource* e, QString& str);
-    static bool decode(const QMimeSource* e, QString& str, QCString& subtype);
-  };
-
-  //protected constructor and destructor because we do not allow inheritance, functionality is provided by static functions
-	CDragDropMgr();
-	virtual ~CDragDropMgr();  
-};
-
-#endif
diff --git a/bibletime/frontend/cexportmanager.cpp b/bibletime/frontend/cexportmanager.cpp
deleted file mode 100644
index cdf971a..0000000
--- a/bibletime/frontend/cexportmanager.cpp
+++ /dev/null
@@ -1,496 +0,0 @@
-/***************************************************************************
-                          cexportmanager.cpp  -  description
-                             -------------------
-    begin                : Mon Feb 25 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cexportmanager.h"
-
-#include "backend/cswordkey.h"
-#include "backend/cswordmoduleinfo.h"
-#include "backend/creferencemanager.h"
-#include "backend/cswordversekey.h"
-#include "backend/centrydisplay.h"
-
-#include "printing/cprintitem.h"
-#include "printing/cprinter.h"
-
-#include "util/ctoolclass.h"
-#include "util/scoped_resource.h"
-
-//Qt includes
-#include <qclipboard.h>
-#include <qptrlist.h>
-#include <qprogressdialog.h>
-
-//KDE includes
-#include <kprogress.h>
-#include <kfiledialog.h>
-#include <klocale.h>
-#include <kapplication.h>
-
-//Sword includes
-#include <swkey.h>
-#include <listkey.h>
-
-
-CExportManager::CExportManager(const QString& caption, const bool showProgress, const QString& progressLabel, const CSwordBackend::FilterOptions filterOptions, const CSwordBackend::DisplayOptions displayOptions) {
-  m_caption = !caption.isEmpty() ? caption : QString::fromLatin1("BibleTime");
-  m_progressLabel = progressLabel;
-  m_filterOptions = filterOptions;
-  m_displayOptions = displayOptions;
-  m_showProgress = showProgress;
-  m_progressDialog = 0;
-};
-
-const bool CExportManager::saveKey(CSwordKey* key, const Format format, const bool addText) {
-  if (!key)
-    return false;
-
-  const QString filename = getSaveFileName(format);
-  if (filename.isEmpty())
-    return false;
-
-  QString text = QString::null;
-  bool hasBounds = false;
-  if (addText) { //add the text of the key to the content of the file we save
-    CPointers::backend()->setFilterOptions(m_filterOptions);
-    CPointers::backend()->setDisplayOptions(m_displayOptions);
-
-    CSwordModuleInfo* module = key->module();
-  	if (CSwordVerseKey* vk = dynamic_cast<CSwordVerseKey*>(key) ) { //we can have a boundary
-      if (vk->isBoundSet()) {//we have a valid boundary!
-        hasBounds = true;
-        CSwordVerseKey startKey(module);
-        CSwordVerseKey stopKey(module);
-
-    		startKey.key(vk->LowerBound());
-    		stopKey.key(vk->UpperBound());
-
-        QString entryText;
-        if (format == HTML) {
-          text = QString::fromLatin1("<html><head><meta http-equiv=Content-Type content=\"text/html; charset=utf-8\"><style type=\"text/css\">%1</style></head><body>")
-                   .arg(htmlCSS(module));
-        };
-
-        //add the heading
-        if (startKey < stopKey) { //we have a boundary
-          QString bound = QString::fromLatin1("%1 - %2").arg(startKey.key()).arg(stopKey.key());
-          text +=
-            (format == HTML)
-            ? QString::fromLatin1("<h3>%1</h3><br/>").arg(bound)
-            : QString::fromLatin1("%1\n\n").arg(bound);
-
-         	while ( (startKey < stopKey) || (startKey == stopKey) ) {
-            entryText = (format == HTML) ? startKey.renderedText(CSwordKey::HTMLEscaped) : startKey.strippedText();
-
-         		text += ((bool)m_displayOptions.verseNumbers ? QString::fromLatin1("%1 ").arg(startKey.Verse()) : QString::null)
-+ entryText + lineBreak(format);
-
-            startKey.next(CSwordVerseKey::UseVerse);
-          }
-        }
-        else {
-          hasBounds = false;
-        };
-      }
-  	}
-
-    if (!hasBounds) { //no verse key, so we can't have a boundary!
-      text =
-        (format == HTML)
-        ? QString::fromLatin1("<html><head><title>%1</title><meta http-equiv=Content-Type content=\"text/html; charset=utf-8\"></head><body><h3>%2 (%3)</h3><br/>%4") //HTML escaped text
-            .arg(key->key())
-            .arg(key->key())
-            .arg(module->name())
-            .arg(key->renderedText(CSwordKey::HTMLEscaped))
-        : QString::fromLatin1("%1 (%2)\n\n%3") //plain text
-            .arg(key->key())
-            .arg(module->name())
-            .arg(key->strippedText());
-      //we should only add the reference if the key has no bounds
-      text +=
-        lineBreak(format) +
-        QString::fromLatin1("(%1, %1)")
-            .arg(key->key())
-            .arg(module->name());
-    }
-
-    if (format == HTML) {
-      text += QString::fromLatin1("</body></html>");
-    };
-  }
-  else { //don't add the text of the key, we
-    text = key ? key->key() : QString::null;
-  	return true;
-  }
-
-	CToolClass::savePlainFile(filename, text, false, (format==HTML) ? QTextStream::UnicodeUTF8 : QTextStream::Locale);
-	return true;
-};
-
-const bool CExportManager::saveKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText) {
-  if (!list)
-    return false;
-  const QString filename = getSaveFileName(format);
-  if (filename.isEmpty())
-    return false;
-
-  setProgressRange(list->Count());
- 	util::scoped_ptr<CSwordKey> key(CSwordKey::createInstance(module));
- 	QString text;
- 	(*list) = sword::TOP;
- 	while (!list->Error() && !progressWasCancelled()) {
- 		if (!key)
- 			break;
-    key->key((const char*)(*list));
-
-    if (addText) {
- 			text += QString::fromLatin1("%1:%2\t%3\n").arg( key->key() ).arg(lineBreak(format)).arg( (format == HTML) ? key->renderedText(CSwordKey::HTMLEscaped) : key->strippedText() );
-    }
- 		else {
- 			text += key->key() + lineBreak(format);
-    }
-
-    incProgress();
- 		(*list)++;
- 	}
-
-  if (!progressWasCancelled()) {
- 		CToolClass::savePlainFile(filename, text);
- 		closeProgressDialog();
- 		return true;
- 	}
-	return false;
-};
-
-const bool CExportManager::saveKeyList(QPtrList<CSwordKey> list, const Format format, const bool addText ) {
-  if (!list.count())
-    return false;
-
-	const QString filename = getSaveFileName(format);
-  if (filename.isEmpty())
-    return false;
-
-	QString text;
-  setProgressRange(list.count());
-  for (CSwordKey* k = list.first(); k && !progressWasCancelled(); k = list.next()) {
- 		if (addText) {
- 			text += QString::fromLatin1("%1:%2\t%3\n").arg( k->key() ).arg(lineBreak(format)).arg( (format == HTML) ? k->renderedText(CSwordKey::HTMLEscaped) : k->strippedText() );
-		}
- 		else {
- 			text += k->key() + lineBreak(format);
-		}
-    incProgress();
-  };
-
-  if (!progressWasCancelled()) {
- 		CToolClass::savePlainFile(filename, text);
- 		closeProgressDialog();
- 		return true;
- 	}
-  return false;
-};
-
-const bool CExportManager::copyKey(CSwordKey* key, const Format format, const bool addText) {
-  if (!key)
-    return false;
-
-  QString text = QString::null;
-  if (addText) {
-    CPointers::backend()->setFilterOptions(m_filterOptions);
-    CPointers::backend()->setDisplayOptions(m_displayOptions);
-
-    CSwordModuleInfo* module = key->module();
-  	if (CSwordVerseKey* vk = dynamic_cast<CSwordVerseKey*>(key) ) {
-      CSwordVerseKey startKey(module);
-      CSwordVerseKey stopKey(module);
-
-  		startKey.key(vk->LowerBound());
-  		stopKey.key(vk->UpperBound());
-      QString entryText;
-  		while ( startKey < stopKey || startKey == stopKey ) {
-        entryText = (format == HTML) ? startKey.renderedText() : startKey.strippedText();
-
-  			text += ((bool)m_displayOptions.verseNumbers ? QString::fromLatin1("%1 ").arg(startKey.Verse()) : QString::null)
-+ entryText + lineBreak(format);
-
-        startKey.next(CSwordVerseKey::UseVerse);
-  		}
-  	}
-    else {
-      text = (format == HTML) ? key->renderedText() : key->strippedText();
-    }
-    text += "\n" + QString::fromLatin1("(%1, %1)").arg(key->key()).arg(module->name());
-  }
-  else { //don't add text
-//    text = key ? key->key() : QString::null;
-    if (CSwordVerseKey* vk = dynamic_cast<CSwordVerseKey*>(key)) { //make sure VerseKeys are localized!
-//      CSwordVerseKey vk( *key );
-      vk->setLocale( backend()->booknameLanguage().latin1() );
-
-      text = vk->key();      
-    }
-    else {
-      text = key->key();
-    }
-  	return true;
-  }
-  KApplication::clipboard()->setText(text);
-	return true;
-};
-
-const bool CExportManager::copyKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText) {
-  if (!list)
-    return false;
-
-  setProgressRange(list->Count());
- 	util::scoped_ptr<CSwordKey> key(CSwordKey::createInstance(module));
-
- 	QString text;
- 	*list = sword::TOP;
- 	while (!list->Error() && !progressWasCancelled()) {
- 		if (!key)
- 			break;
-
-    key->key((const char*)(*list));
- 		if (addText)
-// 			text += QString::fromLatin1("%1:%2\t%3\n").arg( key->key() ).arg(lineBreak(format)).arg( (format == HTML) ? key->renderedText() : key->strippedText() );
- 			text += QString::fromLatin1("%1\t%3\n").arg( key->key() ).arg( (format == HTML) ? key->renderedText() : key->strippedText() );
-
- 		else
- 			text += key->key() + lineBreak(format);
-    incProgress();
- 		(*list)++;
- 	}
-
-  if (!progressWasCancelled()) {
-    KApplication::clipboard()->setText(text);
-		closeProgressDialog();
-   	return true;
- 	}
-	return false;
-};
-
-
-const bool CExportManager::copyKeyList(QPtrList<CSwordKey> list, const Format format, const bool addText ) {
-  if (!list.count())
-    return false;
-
-  QString text;
-  setProgressRange(list.count());
-  for (CSwordKey* k = list.first(); k && !progressWasCancelled(); k = list.next()) {
- 		if (addText)
-// 			text += QString::fromLatin1("%1:%2\t%3\n").arg( k->key() ).arg(lineBreak(format)).arg( (format == HTML) ? k->renderedText() : k->strippedText() );
- 			text += QString::fromLatin1("%1\t%3\n").arg( k->key() ).arg( (format == HTML) ? k->renderedText() : k->strippedText() );
-
- 		else
- 			text += k->key() + lineBreak(format);
-    incProgress();
-  };
-
-  if (!progressWasCancelled()) {
-    KApplication::clipboard()->setText(text);
- 		closeProgressDialog();
- 		return true;
- 	}
-  return false;
-};
-
-const bool CExportManager::printKeyList(sword::ListKey* list, CSwordModuleInfo* module) {
-  setProgressRange(list->Count()+1);
-	QPtrList<CPrintItem> itemList;
-	QString startKey, stopKey;
-
-	(*list) = sword::TOP;
-	while (!list->Error() && !progressWasCancelled()) {
-		sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(list);
-		if (vk) {
-			startKey = QString::fromLocal8Bit((const char*)(vk->LowerBound()) );
-			stopKey = QString::fromLocal8Bit((const char*)(vk->UpperBound()) );
-		}
-		else {
-			startKey = QString::fromLocal8Bit((const char*)*list);
-			stopKey = QString::null;
-		//add all items to the queue
-	  }
-    itemList.append( new CPrintItem(module, startKey, stopKey, QString::null, m_displayOptions, m_filterOptions) );
-    incProgress();    
-		(*list)++;
-	}
-
-	//add all items to the queue
-	if (progressWasCancelled()) {
-		itemList.setAutoDelete(true);
-		itemList.clear();//delete all items
-		return false;
-	}
-
-  printer()->appendItems(itemList);
-  closeProgressDialog();    //close the dialog
-	return true;
-};
-
-const bool CExportManager::printKeyList( const PrintItemList& list, CSwordModuleInfo* module ){
-  if (!list.count() || !module)
-    return false;
-  setProgressRange(list.count()+1);
-//  KApplication::kApplication()->processEvents(); //do not lock the GUI!
-    
-  PrintItemList::ConstIterator it;
-  for ( it = list.begin(); (it != list.end()) && !progressWasCancelled(); ++it ) {
-    printer()->appendItem( new CPrintItem(module,(*it).first,(*it).second, QString::null, m_displayOptions, m_filterOptions) );
-//  	KApplication::kApplication()->processEvents(); //do not lock the GUI!    
-  }
-  
-  closeProgressDialog(); //to close the dialog
-	return true;
-}
-
-const bool CExportManager::printKey( CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, const QString& description ){
-	printer()->appendItem( new CPrintItem(module, startKey, stopKey, description, m_displayOptions, m_filterOptions) );
-	return true;
-}
-
-const bool CExportManager::printKey( CSwordKey* key, const QString& description ){
-	printer()->appendItem( new CPrintItem(key->module(),key->key(), key->key(), description, m_displayOptions, m_filterOptions) );
-	return true;
-}
-
-/** Prints a key using the hyperlink created by CReferenceManager. */
-const bool CExportManager::printByHyperlink( const QString& hyperlink ){
- 	QString moduleName;
-  QString keyName;
-  CReferenceManager::Type type;
-
-  CReferenceManager::decodeHyperlink(hyperlink, moduleName, keyName, type);
-  if (moduleName.isEmpty()) {
-  	moduleName = CReferenceManager::preferredModule(type);
-	}
-
- 	if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) {
-    QString startKey = keyName;
-    QString stopKey = keyName;
-
-    //check if we have a range of entries or a single one
-    if (module->type() == CSwordModuleInfo::Bible || module->type() == CSwordModuleInfo::Commentary) {
-     sword:: ListKey verses =sword:: VerseKey().ParseVerseList((const char*)keyName.local8Bit(), "Genesis 1:1", true);
-    	for (int i = 0; i < verses.Count(); ++i) {
-    		sword::VerseKey* element = dynamic_cast<sword::VerseKey*>(verses.GetElement(i));
-    		if (element)
-        	CExportManager::printKey(module,QString::fromLocal8Bit((const char*)element->LowerBound()), QString::fromLocal8Bit((const char*)element->UpperBound()) );
-    		else
-					CExportManager::printKey(module,(const char*)*verses.GetElement(i),(const char*)*verses.GetElement(i));
-    	}
-		}
-  	else {
-			CExportManager::printKey(module,keyName,keyName);
-    }
-	}
-  return true;
-}
-
-/** Returns the string for the filedialogs to show the correct files. */
-const QString CExportManager::filterString( const Format format ){
-  switch (format) {
-    case HTML:
-      return i18n("*.html *.htm | HTML files\n *.* | All files (*.*)");
-    case Text:
-      return i18n("*.txt | Text files\n *.* | All files (*.*)");
-    default:
-      return i18n("All files (*.*)");
-  };
-}
-
-/** Returns a filename to save a file. */
-const QString CExportManager::getSaveFileName(const Format format){
-  return KFileDialog::getSaveFileName(QString::null, filterString(format), 0, m_caption);
-}
-
-/** Returns a string containing the linebreak for the current format. */
-const QString CExportManager::lineBreak(const Format format){
-  if (static_cast<bool>(m_displayOptions.lineBreaks))
-    return (format == HTML) ? QString::fromLatin1("<BR>\n") : QString::fromLatin1("\n");
-  else
-    return QString::null;
-}
-
-/** Returns the CSS string used in HTML pages. */
-const QString CExportManager::htmlCSS(CSwordModuleInfo* module){
-  CEntryDisplay* display = module ? module->getDisplay() : 0;
-  if (!display) {
-    return QString::null;
-  }
-
-  QString css = QString::null;
-  for (int i = CEntryDisplay::MinType; i <= CEntryDisplay::MaxType; ++i) {
-    CEntryDisplay::StyleType type = static_cast<CEntryDisplay::StyleType>(i);
-    if (type != CEntryDisplay::Body && type != CEntryDisplay::Background) {
-      css += display->cssString( type );
-    }
-  }
-  return css;
-}
-
-/** No descriptions */
-void CExportManager::setProgressRange( const int items ){
-  if (QProgressDialog* dlg = progressDialog()) {
-    dlg->setTotalSteps(items);
-    dlg->setProgress(0);
-  	dlg->setMinimumDuration(0);
-    dlg->show();
-    dlg->repaint();
-  	KApplication::kApplication()->processEvents(); //do not lock the GUI!    
-  }
-}
-
-/** Creates the progress dialog with the correct settings. */
-QProgressDialog* const CExportManager::progressDialog(){
-  if (!m_showProgress) {
-    return 0;
-  };
-  if (!m_progressDialog) {
-    m_progressDialog = new QProgressDialog( m_caption, m_progressLabel, 1, 0, "progress", true );
-    m_progressDialog->setCaption("BibleTime");
-  };
-  return m_progressDialog;
-}
-
-/** Increments the progress by one item. */
-void CExportManager::incProgress(){
-  if (QProgressDialog* dlg = progressDialog()) {
-    KApplication::kApplication()->processEvents(); //do not lock the GUI!
-    dlg->setProgress( dlg->progress() + 1 );
-    dlg->repaint();
-    KApplication::kApplication()->processEvents(); //do not lock the GUI!
-  }
-}
-
-/** No descriptions */
-const bool CExportManager::progressWasCancelled(){
-  if (QProgressDialog* dlg = progressDialog()) {
-    return dlg->wasCancelled();
-  };
-  return true;
-}
-
-/** Closes the progress dialog immediatly. */
-void CExportManager::closeProgressDialog(){
-  if (QProgressDialog* dlg = progressDialog()) {
-    dlg->repaint();
-    dlg->close();
-    dlg->reset();
-  }
-  KApplication::kApplication()->processEvents(); //do not lock the GUI!
-}
diff --git a/bibletime/frontend/cexportmanager.h b/bibletime/frontend/cexportmanager.h
deleted file mode 100644
index 4ed1171..0000000
--- a/bibletime/frontend/cexportmanager.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/***************************************************************************
-                          cexportmanager.h  -  description
-                             -------------------
-    begin                : Mon Feb 25 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CEXPORTMANAGER_H
-#define CEXPORTMANAGER_H
-
-//BibleTime includes
-#include "cbtconfig.h"
-
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qptrlist.h>
-
-class ListKey;
-class CSwordKey;
-class CSwordModuleInfo;
-class QProgressDialog;
-
-typedef std::pair<QString, QString> QStringPair;
-typedef QValueList<QStringPair> PrintItemList;
-
-/**Contains the functions to export text to disk, clipboard or printer.
-  *@author The BibleTime team
-  */
-class CExportManager : CPointers {
-public:
-  enum Format {
-    HTML,
-    Text
-  };
-  
-  CExportManager(const QString& caption, const bool showProgress = true, const QString& progressLabel = QString::null, const CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults(), const CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults());
-  const bool saveKey(CSwordKey* key, const Format format, const bool addText);
-  const bool saveKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText);
-  const bool saveKeyList(QPtrList<CSwordKey> list, const Format format, const bool addText );
-
-  const bool copyKey(CSwordKey* key, const Format format, const bool addText);
-  const bool copyKeyList(sword::ListKey* list, CSwordModuleInfo* module, const Format format, const bool addText);
-  const bool copyKeyList(QPtrList<CSwordKey> list, const Format format, const bool addText );  
-
-  const bool printKey(CSwordKey* key, const QString& description = QString::null);
-  const bool printByHyperlink(const QString& hyperlink);  
-  const bool printKeyList(sword::ListKey* list, CSwordModuleInfo* module);
-  const bool printKeyList(const PrintItemList& list,CSwordModuleInfo* module);  
-  const bool printKey( CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, const QString& description = QString::null );
-
-protected: // Protected methods
-  /**
-  * Returns the string for the filedialogs to show the correct files.
-  */
-  const QString filterString( const Format format );
-  /**
-  * Returns a filename to save a file.
-  */
-  const QString getSaveFileName(const Format format);
-  /**
-  * Returns a string containing the linebreak for the current format.
-  */
-  const QString lineBreak( const Format format );
-
-private:
-  QString m_caption;
-  QString m_progressLabel;
-  bool m_showProgress;
-  CSwordBackend::FilterOptions m_filterOptions;
-  CSwordBackend::DisplayOptions m_displayOptions;
-
-  QProgressDialog* m_progressDialog;
-  
-  /**
-  * Creates the progress dialog with the correct settings.
-  */  
-  QProgressDialog* const progressDialog();
-  /**
-  * Returns the CSS string used in HTML pages.
-  */
-  void setProgressRange( const int item );
-  const QString htmlCSS(CSwordModuleInfo* module);
-  /**
-  * Increments the progress by one item.
-  */
-  inline void incProgress();
-  const bool progressWasCancelled();
-  /**
-  * Closes the progress dialog immediatly.
-  */
-  void closeProgressDialog();
-};
-
-#endif
diff --git a/bibletime/frontend/cinputdialog.cpp b/bibletime/frontend/cinputdialog.cpp
deleted file mode 100644
index 61d6b51..0000000
--- a/bibletime/frontend/cinputdialog.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/***************************************************************************
-                          cinputdialog.cpp  -  description
-                             -------------------
-    begin                : Sun May 13 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//own includes
-#include "cinputdialog.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qlabel.h>
-#include <qtextedit.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kseparator.h>
-
-CInputDialog::CInputDialog(const QString& caption, const QString& description, const QString& text, QWidget *parent, const char *name, const bool modal ) : KDialog(parent,name,modal) {
-	setPlainCaption(caption);
-	
-	QVBoxLayout* topLayout = new QVBoxLayout(this, 5,5);
-		
-	QLabel* l = new QLabel(description, this);
-	topLayout->addWidget(l);
-	
-	topLayout->addSpacing(10);
-	
-	m_editWidget = new QTextEdit(this, "edit widget");
-	m_editWidget->setWordWrap( QTextEdit::WidgetWidth );
-	m_editWidget->setText(text);
-	if (!text.isEmpty())
-		m_editWidget->selectAll();
-	
-	topLayout->addWidget(m_editWidget);
-
-	KSeparator* separator = new KSeparator(KSeparator::HLine, this);
-	topLayout->addWidget(separator);
-		
-	QHBoxLayout* buttonLayout = new QHBoxLayout(topLayout);	
-	
-	buttonLayout->addStretch(2);		
-
-	QPushButton* cancel = new QPushButton(this);
-	cancel->setText(i18n("Cancel"));	
-	connect(cancel, SIGNAL(clicked()), SLOT(reject()));	
-	buttonLayout->addWidget(cancel,1);	
-
-	buttonLayout->addSpacing(15);	
-
-	QPushButton* clear = new QPushButton(this);
-	clear->setText(i18n("Clear"));	
-	connect(clear, SIGNAL(clicked()),m_editWidget, SLOT(clear()));	
-	buttonLayout->addWidget(clear,1);	
-
-	buttonLayout->addSpacing(15);	
-			
-	QPushButton* ok = new QPushButton(this);
-	ok->setText(i18n("Ok"));
-	connect(ok, SIGNAL(clicked()), SLOT(accept()));
-	buttonLayout->addWidget(ok,1);
-	
-	m_editWidget->setFocus();
-}
-
-//CInputDialog::~CInputDialog(){
-//}
-
-/** Returns the text entered at the moment. */
-const QString CInputDialog::text() {
-	return m_editWidget->text();
-}
-
-/** A static function to get some using CInputDialog. */
-const QString CInputDialog::getText( const QString& caption, const QString& description, const QString& text, bool* ok, QWidget* parent, bool modal){
-	CInputDialog* dlg = new CInputDialog(caption, description, text, parent, "", modal);	
-	QString ret = QString::null;
-		
-	const bool isOk = (dlg->exec() == CInputDialog::Accepted);
-	if (isOk)
-		ret = dlg->text();
-	if (ok)
-		*ok = isOk;
-	delete dlg;
-	return ret;
-}
diff --git a/bibletime/frontend/cinputdialog.h b/bibletime/frontend/cinputdialog.h
deleted file mode 100644
index 8fa2c11..0000000
--- a/bibletime/frontend/cinputdialog.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
-                          cinputdialog.h  -  description
-                             -------------------
-    begin                : Sun May 13 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CINPUTDIALOG_H
-#define CINPUTDIALOG_H
-
-//KDE includes
-#include <kdialog.h>
-
-class QTextEdit;
-class QWidget;
-
-/** This is a small input dialog with
-	* a multiline edit for the text input.
-  * @author The BibleTime team
-  */
-class CInputDialog : public KDialog  {
-   Q_OBJECT
-public: 	
-	CInputDialog(const QString& caption, const QString& description, const QString& text, QWidget *parent=0, const char *name=0, const bool modal = true);
-  /**
- 	* A static function to get some using CInputDialog.
- 	*/
-  static const QString getText( const QString& caption, const QString& description, const QString& text = QString::null, bool* ok = 0, QWidget* parent = 0, bool modal = true);
-  /**
- 	* Returns the text entered at the moment.
- 	*/
-  const QString text();
-//	~CInputDialog();
-
-private:
-	QTextEdit* m_editWidget;
-};
-
-#endif
diff --git a/bibletime/frontend/cmdiarea.cpp b/bibletime/frontend/cmdiarea.cpp
deleted file mode 100644
index c1d35bc..0000000
--- a/bibletime/frontend/cmdiarea.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-/***************************************************************************
-                          cmdiarea.cpp  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cmdiarea.h"
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordversekey.h"
-
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/keychooser/ckeychooser.h"
-
-#include "config.h"
-
-//KDE includes
-#include <kpopupmenu.h>
-#include <kapplication.h>
-#include <klocale.h>
-
-//QT includes
-#include <qobjectlist.h>
-#include <qtimer.h>
-#include <qevent.h>
-#include <qwhatsthis.h>
-#include <qtimer.h>
-
-
-CMDIArea::CMDIArea(QWidget *parent, const char *name )
-	: QWorkspace(parent, name),
-    m_guiOption(Nothing),
-    m_childEvent(false),
-    m_deleting(false),
-    m_appCaption(QString::null)
-{			
-	initView();
-	initConnections();
-	readSettings();
-//  setAcceptDrops(true);
-}
-
-CMDIArea::~CMDIArea(){
-}
-
-/** Initializes the view of the MDI area */
-void CMDIArea::initView(){
-//	QWhatsThis::add(this, WT_MDI_AREA_WIDGET );
-	setPaletteBackgroundColor( parentWidget()->paletteBackgroundColor() );	//work around a KDE bug (IMHO was in KDE 2.x)
-}
-
-/** Initilizes the connectiosn to SIGNALS */
-void CMDIArea::initConnections(){
-	connect(this, SIGNAL(windowActivated(QWidget*)),
-		this, SLOT(slotClientActivated(QWidget*)));
-}
-
-/** Called whan a client window was activated */
-void CMDIArea::slotClientActivated(QWidget* client){
-	if (!client || !isUpdatesEnabled()) {
-    return;
-  }
-
-	CDisplayWindow* sp = dynamic_cast<CDisplayWindow*>(client);	
-	if (!sp || !sp->isReady())
-		return;
-
-  QWidgetList windows = windowList();
-  for ( QWidget* w = windows.first(); w; w = windows.next() ) {
-
-//Don't use!! It would disable accel enabling for the active window, see CDisplayWindow::windowActivated
-/*    if (w == client)
-        continue;
-*/
-
-   	CDisplayWindow* window = dynamic_cast<CDisplayWindow*>(w);	
-		window->windowActivated( (window == sp) ? true : false);
-	}	
-	
-	emit sigSetToplevelCaption( ( m_appCaption = client->caption().stripWhiteSpace() ) );	
-}
-
-/** Reimplementation. Used to make use of the fixedGUIOption part. */
-void CMDIArea::childEvent( QChildEvent * e ){
-	QWorkspace::childEvent(e);
-
-	if ( m_childEvent || !isUpdatesEnabled() || !e) {
-    if (windowList().count() == 0) {
-      m_deleting = false;
-    }
-		return;
-  }
-  
-	m_childEvent = true;
-	
-	if (!windowList().count()) {
-		m_appCaption = QString::null;
-		emit sigSetToplevelCaption( KApplication::kApplication()->makeStdCaption(m_appCaption) );
-		emit sigLastPresenterClosed();
-	}	
-
-  if (!m_deleting && isUpdatesEnabled() && (e->inserted() || e->removed()) ) {
-		switch (m_guiOption) {
-	 		case autoTile:
-				QTimer::singleShot(0, this, SLOT(myTile()));
-	 			break;
-	 		case autoCascade:
-				myCascade();
-	 			break;
-	 		default:
-	 			break;
-		}
-
-	}
-
-  m_childEvent = false;
-
-  if (windowList().count() == 0) {
-    m_deleting = false;
-  }
-}
-
-/** Reimplementation */
-void CMDIArea::resizeEvent(QResizeEvent* e){
-	QWorkspace::resizeEvent(e);	
-
-  if (m_deleting ||  !isUpdatesEnabled()) {
-    return;
-  };
-  
-  switch (m_guiOption) {
- 		case autoTile:
-			myTile();
- 			break;
- 		case autoCascade:
-			myCascade();
- 			break;
- 		default:
- 			break;
-	}
-}
-
-/**  */
-void CMDIArea::saveSettings(){
-}
-
-/**  */
-void CMDIArea::readSettings(){
-}
-
-/** Deletes all the presenters in the MDI area. */
-void CMDIArea::deleteAll(){	
-  /*
-  will be set to false in childEvent, deleting windows is processed in the background, i.e.
-  control leaves this function
-  */
-  m_deleting = true;
-
-  QWidgetList windows( windowList() ); //copy pointers
-  windows.setAutoDelete( false );
-  const int count = windows.count();
-  for (int i = count-1; i >= 0; --i) {
-    QWidget* w = windows.at(i);
-    windows.remove(i);
-    delete w;
-  };
-
-//  m_deleting = false;
-}
-
-/** Enable / disable autoCascading */
-void CMDIArea::setGUIOption( const MDIOption& newOption ){
-	//now do the initial action
-	switch (( m_guiOption = newOption )) { //set new value and decide what to do
- 		case autoTile:
-			myTile();
- 			break;
- 		case autoCascade:
-			myCascade();
- 			break;
- 		default:
- 			break;
- 	}
-}
-
-/**  */
-void CMDIArea::myTile(){
-	if (m_deleting || !isUpdatesEnabled() || !windowList().count() )	{
-    return;
-  }
-
-	if ((windowList().count() == 1) && windowList().at(0)) {
-		m_appCaption = windowList().at(0)->caption();
-		windowList().at(0)->parentWidget()->showMaximized();
-	}
-	else {
-    QWidget* active = activeWindow();
-	  tile();
-    active->setFocus();
-  }
-}
-
-/**  */
-void CMDIArea::myCascade(){
-	if (m_deleting || !isUpdatesEnabled() || !windowList().count() ) {
-		return;
-  }
-    
-	if ((windowList().count() == 1) && windowList().at(0)) {
-    m_appCaption = windowList().at(0)->caption();
-		windowList().at(0)->parentWidget()->showMaximized();
-	}
- 	else {
-    QWorkspace::cascade();
-  }
-}
-
-/** This works around a problem/limitation in QWorkspace. QWorkspace sets every time the  application caption on its on way. This confuses BibleTime - wrong captions are generated. This function returns the right caption (using the MDI child). */
-const QString CMDIArea::currentApplicationCaption() const {
-	return m_appCaption;
-}
-
-/** Emits the signal to create a new display window in the MDI area. */
-void CMDIArea::emitCreateDisplayWindow( ListCSwordModuleInfo modules, const QString keyName ) {
-  emit createReadDisplayWindow(modules, keyName);
-}
-
diff --git a/bibletime/frontend/cmdiarea.h b/bibletime/frontend/cmdiarea.h
deleted file mode 100644
index 978363a..0000000
--- a/bibletime/frontend/cmdiarea.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/***************************************************************************
-                          cmdiarea.h  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CMDIAREA_H
-#define CMDIAREA_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-#include "backend/cswordmoduleinfo.h"
-
-//Qt includes
-#include <qworkspace.h>
-#include <qptrlist.h>
-#include <qstrlist.h>
-#include <qevent.h>
-
-class KPopupMenu;
-class CSwordModuleInfo;
-class CSwordKey;
-
-/** The MDI widget we use in BibleTime.
-	* Enhances QWorkspace.
-  * @author The BibleTime Team
-  */
-class CMDIArea : public QWorkspace, public CPointers  {
-   Q_OBJECT
-
-public:
-	/**
-	* The options you can set for this widget.
-	*/
-	enum MDIOption {
-		autoTile,
-		autoCascade,
-		Nothing
-	};	
-	CMDIArea(QWidget *parent=0, const char *name = 0 );
-	~CMDIArea();
-  /**
-  */
-  void readSettings();
-  /**
-  */
-  void saveSettings();
-  /**
-  * Enable / disable autoCascading
-  */
-  void setGUIOption( const MDIOption& newOption );
-  /**
-  * This works around a problem/limitation in QWorkspace. QWorkspace sets every time the 	
-  * application caption on its on way. This confuses BibleTime - wrong captions are generated.
-	* This function returns the right caption (using the MDI child).
-	*/
-  const QString currentApplicationCaption() const;
-
-public slots:
-  /**
-  * Called whan a client window was activated
-  */
-	void slotClientActivated(QWidget* client);
-  /**
-  * Deletes all the presenters in the MDI area.
-  */
-  void deleteAll();
-  /** Our own cascade version which, if only one window is left, shows this maximized.  
- 	* Also necessary for autoCasacde feature
- 	*/
-  void myCascade();
-  /** Our own cascade version which, if only one window is left, shows this maximized.
- 	* Also necessary for autoTile feature
- 	*/
-  void myTile();
-  /**
-  * Emits the signal to create a new display window in the MDI area.
-  */
-  void emitCreateDisplayWindow( ListCSwordModuleInfo modules, const QString keyName );
-
-protected: // Protected methods
-  /**
-  * Used to make use of the fixedGUIOption part.
-  */
-  virtual void childEvent (QChildEvent * e);
-  /**
-  * Reimplementation
-  */
-  virtual void resizeEvent(QResizeEvent* e);
-  /**
-  * Initializes the connectiosn to SIGNALS
-  */
-  void initConnections();
-  /**
-  * Initializes the view of the MDI area
-  */
-  void initView();
-		
-signals: // Signals
-  /**
-  * Emits a signal to set the acption of the toplevel widget.
-  */
-  void sigSetToplevelCaption(const QString&);
-  /**
-  * Is emitted when the last presenter was closed.
-  */
-  void sigLastPresenterClosed();
-  void createReadDisplayWindow(ListCSwordModuleInfo modules, const QString& keyName);
-
-private:
-	MDIOption m_guiOption;
-	bool m_childEvent;
-  bool m_deleting;
-	QString m_appCaption;
-};
-#endif
diff --git a/bibletime/frontend/coptionsdialog.cpp b/bibletime/frontend/coptionsdialog.cpp
deleted file mode 100644
index f921320..0000000
--- a/bibletime/frontend/coptionsdialog.cpp
+++ /dev/null
@@ -1,1001 +0,0 @@
-/***************************************************************************
-                          coptionsdialog.cpp  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "coptionsdialog.h"
-#include "cprofile.h"
-
-#include "backend/cswordbackend.h"
-#include "backend/cswordmoduleinfo.h"
-
-#include "frontend/displaywindow/cbiblereadwindow.h"
-#include "frontend/displaywindow/ccommentaryreadwindow.h"
-#include "frontend/displaywindow/clexiconreadwindow.h"
-#include "frontend/displaywindow/cbookreadwindow.h"
-#include "frontend/displaywindow/creadwindow.h"
-
-#include "util/cresmgr.h"
-#include "util/ctoolclass.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-//QT includes
-#include <qhbox.h>
-#include <qlayout.h>
-#include <qvbox.h>
-#include <qdict.h>
-#include <qcheckbox.h>
-#include <qbuttongroup.h>
-#include <qhbuttongroup.h>
-#include <qradiobutton.h>
-#include <qcolor.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-#include <qstringlist.h>
-#include <qinputdialog.h>
-#include <qdir.h>
-
-
-//KDE includes
-#include <kapp.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kstandarddirs.h>
-#include <kkeydialog.h>
-#include <kiconloader.h>
-#include <ktabctl.h>
-#include <kapp.h>
-#include <klistbox.h>
-#include <kkeydialog.h>
-#include <kaction.h>
-#include <kconfigbase.h>
-#include <kconfig.h>
-
-//Sword includes
-#include <localemgr.h>
-
-using std::string;
-using std::list;
-
-COptionsDialog::COptionsDialog(QWidget *parent, const char *name, KAccel* accel )
-	: KDialogBase(IconList, i18n("Preferences"), Ok | Cancel | Apply, Ok, parent, name, true, true, QString::null, QString::null, QString::null) {
-
-	m_settings.keys.application.accel = accel;
-	setIconListAllVisible(true);
-
-	initStartup();		
-	initFonts();
-	initColors();	
-	initProfiles();
-	initSword();
-	initAccelerators();
-}
-
-/**  */
-void COptionsDialog::newDisplayWindowFontSelected(const QFont &newFont){
-  CBTConfig::FontSettingsPair oldSettings = m_settings.fonts.fontMap[ m_settings.fonts.usage->currentText() ];
-	m_settings.fonts.fontMap.replace( m_settings.fonts.usage->currentText(), CBTConfig::FontSettingsPair(oldSettings.first, newFont) );		
-}
-
-/** Called when the combobox contents is changed */
-void COptionsDialog::newDisplayWindowFontAreaSelected(const QString& usage){
-  useOwnFontClicked( m_settings.fonts.fontMap[usage].first );
-  m_settings.fonts.useOwnFontBox->setChecked( m_settings.fonts.fontMap[usage].first );
-
-  m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[usage].second );
-}
-
-/** Called if the OK button was clicked */
-void COptionsDialog::slotOk(){
-	saveAccelerators();
-	saveColors();
-	saveFonts();
-	saveSword();
-	saveStartup();
-	saveProfiles();
-	
-	KDialogBase::slotOk();
-
-  emit signalSettingsChanged( );
-}
-
-/*called if the apply button was clicked*/
-void COptionsDialog::slotApply(){
-	saveAccelerators();
-	saveColors();
-	saveFonts();
-	saveSword();
-	saveStartup();
-	saveProfiles();
-	
-	KDialogBase::slotApply();
-
-  emit signalSettingsChanged( );
-}
-
-/** Adds a new view profile to the list. */
-void COptionsDialog::addNewProfile(){
-	bool ok = false;
-	QString name = QInputDialog::getText(i18n("Create new session"), i18n("Please enter a name for the new session."), QLineEdit::Normal, QString::null, &ok);
-	if (ok && !name.isEmpty()) {
-		m_settings.profiles.mgr.create(name);
-		m_settings.profiles.profiles->insertItem(name);				
-		if (m_settings.profiles.profiles->count() == 1)
-			m_settings.profiles.profiles->setEnabled(true);		
-	}
-}
-
-/** No descriptions */
-void COptionsDialog::deleteProfile(){
-	const QString profile = m_settings.profiles.profiles->currentText();
-	m_settings.profiles.mgr.remove(profile);
-	m_settings.profiles.profiles->removeItem( m_settings.profiles.profiles->currentItem() );
-}
-
-/** Renames the currently selected profile. */
-void COptionsDialog::renameProfile(){
-	bool ok = false;
-	const QString currentProfile = m_settings.profiles.profiles->currentText();	
-	CProfile* profile = m_settings.profiles.mgr.profile(currentProfile);
-	if (!profile)
-		return;
-	const QString newName = QInputDialog::getText(i18n("Rename session"), i18n("Please enter a new name for the session."), QLineEdit::Normal, profile->name(), &ok);
-	if (ok && !newName.isEmpty()) {
-		profile->setName(newName);
-		m_settings.profiles.profiles->changeItem(newName, m_settings.profiles.profiles->currentItem());
-	}	
-}
-
-/** Opens the page which contaisn the given part ID. */
-const bool COptionsDialog::showPart( COptionsDialog::Parts ID ){
-	bool ret = false;
-	switch (ID) {
-		case COptionsDialog::ViewProfiles:
-			if(showPage(pageIndex(
-					m_settings.profiles.profiles->parentWidget()) ))
-				ret = true;
-			break;
-		default:
-			break;
-	}
-	return ret;
-}
-
-/** Initializes the startup section of the OD. */
-void COptionsDialog::initStartup(){
-	QFrame* page = addPage(i18n("Startup"), QString::null, DesktopIcon(CResMgr::settings::startup::icon,32));
-	QVBoxLayout* layout = new QVBoxLayout(page,5);
-
-  {//daily tips
-		m_settings.startup.showTips = new QCheckBox(page);
-		m_settings.startup.showTips->setText(i18n("Show tip of the day"));
-		QToolTip::add(m_settings.startup.showTips, CResMgr::settings::startup::dailyTip::tooltip );	
-		QWhatsThis::add(m_settings.startup.showTips, CResMgr::settings::startup::dailyTip::whatsthis );
-		
-		m_settings.startup.showTips->setChecked( CBTConfig::get(CBTConfig::tips) );
-	}
-	layout->addWidget(m_settings.startup.showTips);
-	
-	{ //startup logo
-		m_settings.startup.showLogo = new QCheckBox(page);
-		m_settings.startup.showLogo->setText(i18n("Show startuplogo"));
-		QToolTip::add(m_settings.startup.showLogo, CResMgr::settings::startup::showLogo::tooltip);		
-    QWhatsThis::add(m_settings.startup.showLogo, CResMgr::settings::startup::showLogo::whatsthis);
-		
-		m_settings.startup.showLogo->setChecked(CBTConfig::get(CBTConfig::logo));			
-	}		
-	layout->addWidget(m_settings.startup.showLogo);
-
-  { //workspace
-		m_settings.startup.restoreWorkspace = new QCheckBox(page);
-		m_settings.startup.restoreWorkspace->setText(i18n("Restore windows from the last BibleTime session"));
-		QToolTip::add(m_settings.startup.restoreWorkspace, CResMgr::settings::startup::restoreWorkingArea::tooltip);		
-		QWhatsThis::add(m_settings.startup.restoreWorkspace, CResMgr::settings::startup::restoreWorkingArea::whatsthis);
-
-		m_settings.startup.restoreWorkspace->setChecked(CBTConfig::get(CBTConfig::restoreWorkspace));
-	}
-	layout->addWidget(m_settings.startup.restoreWorkspace);			
-	
-	layout->addStretch(4);
-}
-
-/** Init fonts section. */
-void COptionsDialog::initFonts(){
-	QFrame* page = addPage(i18n("Fonts"), QString::null, DesktopIcon(CResMgr::settings::fonts::icon, 32));
-	QVBoxLayout* layout = new QVBoxLayout(page,5);
-
- 	layout->addWidget(
-    CToolClass::explanationLabel(
-      page,
-      i18n("Select custom fonts per-language"),
-      i18n("Here you find a list of all languages of the installed modules. \
-You can specify a custom font for each language that needs a special font \
-to be displayed correctly.")
-    )
-  );
-  layout->addSpacing(5);
-
-
-  //horizontal layout box to contain the chooser box and use own font checkbox
-  QHBoxLayout* hLayout = new QHBoxLayout();
-
- 	m_settings.fonts.usage = new QComboBox(page);
- 	QToolTip::add(m_settings.fonts.usage, CResMgr::settings::fonts::typeChooser::tooltip);
- 	QWhatsThis::add(m_settings.fonts.usage, CResMgr::settings::fonts::typeChooser::whatsthis);
-
-  hLayout->addWidget(m_settings.fonts.usage);
-
-  CLanguageMgr::LangMap langMap = languageMgr()->availableLanguages();
-  CLanguageMgr::LangMap::Iterator it;
-
-  for ( it = langMap.begin(); it != langMap.end(); ++it ) {
-    const QString name = it.data().translatedName().isEmpty() ? it.data().abbrev() : it.data().translatedName();
-    m_settings.fonts.fontMap.insert(name, CBTConfig::get(it.data()) );
-  }
-
-  for( QMap<QString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) {
-		if ( m_settings.fonts.fontMap[it.key()].first ) { //show font icon
-	 		m_settings.fonts.usage->insertItem(SmallIcon("fonts"), it.key() );
-    }
-		else {	//don't show icon for font
-	 		m_settings.fonts.usage->insertItem(it.key());
-    }
-  }
-
-
-  m_settings.fonts.useOwnFontBox = new QCheckBox(i18n("Use custom font"), page, "font checkbox");
-  connect(m_settings.fonts.useOwnFontBox, SIGNAL(toggled(bool)), SLOT(useOwnFontClicked(bool)));
- 	hLayout->addWidget(m_settings.fonts.useOwnFontBox);
-
-
-  layout->addLayout(hLayout);
-//#warning TODO: remember the last selected font and jump there.
-
- 	m_settings.fonts.fontChooser = new KFontChooser(page, "fonts", false, QStringList(), true, 5);
- 	m_settings.fonts.fontChooser->setSampleText(i18n("The quick brown fox jumps over the lazy dog."));
- 	layout->addWidget(m_settings.fonts.fontChooser);
-
-  connect(m_settings.fonts.fontChooser, SIGNAL(fontSelected(const QFont&)), SLOT(newDisplayWindowFontSelected(const QFont&)));
-  connect(m_settings.fonts.usage, SIGNAL(activated(const QString&)), SLOT(newDisplayWindowFontAreaSelected(const QString&)));
-
- 	m_settings.fonts.fontChooser->setFont( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].second );
-  useOwnFontClicked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first );
-	m_settings.fonts.useOwnFontBox->setChecked( m_settings.fonts.fontMap[m_settings.fonts.usage->currentText()].first );
- 	m_settings.fonts.fontChooser->setMinimumSize(m_settings.fonts.fontChooser->sizeHint());
-}
-
-/** Init color section. */
-void COptionsDialog::initColors(){
-	QFrame* page = addPage(i18n("Colors"), QString::null, DesktopIcon(CResMgr::settings::colors::icon,32));
-//	QVBoxLayout* layout = new QVBoxLayout(page);
-	QGridLayout* gridLayout = new QGridLayout(page,8,5,5,5);
-  gridLayout->setResizeMode(QLayout::Minimum);
-
-  gridLayout->addMultiCellWidget(
-  	CToolClass::explanationLabel(page,
-  		i18n("Choose colors"),
-  		i18n("Choose custom colors to alter the apperance of the display windows. \
-Some options like \"Words of Jesus\" only apply to texts which offer special features.")
-  	),
-  	0,0,0,-1
-  );
-
-	m_settings.colors.text = new KColorButton(CBTConfig::get(CBTConfig::textColor), page);
-  QToolTip::add(m_settings.colors.text, CResMgr::settings::colors::text::tooltip);
-  QWhatsThis::add(m_settings.colors.text, CResMgr::settings::colors::text::whatsthis);
-
-	QLabel* label = new QLabel(m_settings.colors.text, i18n("Text"), page);
-	gridLayout->addWidget(label,1,0);
-	gridLayout->addWidget(m_settings.colors.text,1,1);
-  QToolTip::add(label, CResMgr::settings::colors::text::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::text::whatsthis);
-
-
-	m_settings.colors.highlightedVerse = new KColorButton(CBTConfig::get(CBTConfig::highlightedVerseColor), page);
-  QToolTip::add(m_settings.colors.highlightedVerse, CResMgr::settings::colors::highlightedVerse::tooltip);
-  QWhatsThis::add(m_settings.colors.highlightedVerse, CResMgr::settings::colors::highlightedVerse::whatsthis);
-
-	label = new QLabel(m_settings.colors.highlightedVerse, i18n("Highlighted verse"), page);
-  QToolTip::add(label, CResMgr::settings::colors::highlightedVerse::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::highlightedVerse::whatsthis);
-
-  gridLayout->addWidget(label,1,3);
-	gridLayout->addWidget(m_settings.colors.highlightedVerse,1,4);
-
-
-	m_settings.colors.background = new KColorButton(CBTConfig::get(CBTConfig::backgroundColor), page);
-  QToolTip::add(m_settings.colors.background, CResMgr::settings::colors::background::tooltip);
-  QWhatsThis::add(m_settings.colors.background, CResMgr::settings::colors::background::whatsthis);
-
-  label = new QLabel(m_settings.colors.background, i18n("Background"), page);
-  QToolTip::add(label, CResMgr::settings::colors::background::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::background::whatsthis);
-
-  gridLayout->addWidget(label,2,0);
-	gridLayout->addWidget(m_settings.colors.background,2,1);
-
-
-  m_settings.colors.swordrefs = new KColorButton(CBTConfig::get(CBTConfig::swordRefColor), page);
-  QToolTip::add(m_settings.colors.swordrefs, CResMgr::settings::colors::links::tooltip);
-  QWhatsThis::add(m_settings.colors.swordrefs, CResMgr::settings::colors::links::whatsthis);
-
-	label = new QLabel(m_settings.colors.swordrefs,i18n("Hyperlinks"), page);
-  QToolTip::add(label, CResMgr::settings::colors::links::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::links::whatsthis);
-
-  gridLayout->addWidget(label,4,0);
-	gridLayout->addWidget(m_settings.colors.swordrefs,4,1);
-
-	m_settings.colors.footnotes = new KColorButton(CBTConfig::get(CBTConfig::footnotesColor), page);
-  QToolTip::add(m_settings.colors.footnotes, CResMgr::settings::colors::footnotes::tooltip);
-  QWhatsThis::add(m_settings.colors.footnotes, CResMgr::settings::colors::footnotes::whatsthis);
-
-  label = new QLabel(m_settings.colors.footnotes,i18n("Footnotes"), page);
-  QToolTip::add(label, CResMgr::settings::colors::footnotes::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::footnotes::whatsthis);
-
-	gridLayout->addWidget(label,6,0);
-	gridLayout->addWidget(m_settings.colors.footnotes,6,1);
-
-	m_settings.colors.jesuswords = new KColorButton(CBTConfig::get(CBTConfig::jesuswordsColor), page);
-  QToolTip::add(m_settings.colors.jesuswords, CResMgr::settings::colors::jesusWords::tooltip);
-  QWhatsThis::add(m_settings.colors.jesuswords, CResMgr::settings::colors::jesusWords::whatsthis);
-
-  label = new QLabel(m_settings.colors.jesuswords, i18n("Words of Jesus"), page);
-  QToolTip::add(label, CResMgr::settings::colors::jesusWords::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::jesusWords::whatsthis);
-
-	gridLayout->addWidget(label,6,3);
-	gridLayout->addWidget(m_settings.colors.jesuswords,6,4);
-
-
-	m_settings.colors.strongs = new KColorButton(CBTConfig::get(CBTConfig::strongsColor), page);
-  QToolTip::add(m_settings.colors.strongs, CResMgr::settings::colors::strongNumbers::tooltip);
-  QWhatsThis::add(m_settings.colors.strongs, CResMgr::settings::colors::strongNumbers::whatsthis);
-
-  label = new QLabel(m_settings.colors.strongs, i18n("Strong's numbers"), page);
-	QToolTip::add(label, CResMgr::settings::colors::strongNumbers::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::strongNumbers::whatsthis);
-
-  gridLayout->addWidget(label,7,0);
-	gridLayout->addWidget(m_settings.colors.strongs,7,1);
-
-
-	m_settings.colors.morph = new KColorButton(CBTConfig::get(CBTConfig::morphsColor), page);
-  QToolTip::add(m_settings.colors.morph, CResMgr::settings::colors::morphTags::tooltip);
-  QWhatsThis::add(m_settings.colors.morph, CResMgr::settings::colors::morphTags::whatsthis);
-
-	label = new QLabel(m_settings.colors.morph, i18n("Morphologic tags"), page);
-  QToolTip::add(label, CResMgr::settings::colors::morphTags::tooltip);
-  QWhatsThis::add(label, CResMgr::settings::colors::morphTags::whatsthis);
-
-  gridLayout->addWidget(label,7,3);
-	gridLayout->addWidget(m_settings.colors.morph,7,4);
-
-	gridLayout->setRowStretch(9, 5);
-	gridLayout->addColSpacing(3, 5);
-	gridLayout->addRowSpacing(3, 10);
-	gridLayout->addRowSpacing(5, 10);
-}
-
-/** Init profiles section. */
-void COptionsDialog::initProfiles(){
-	QFrame* page = addPage(i18n("Sessions"),QString::null, DesktopIcon(CResMgr::settings::profiles::icon,32));
-	QGridLayout* gridLayout = new QGridLayout(page, 3,3,5,5);
-
-	gridLayout->addMultiCellWidget(
-		CToolClass::explanationLabel(page,
-			i18n("Manage sessions"),
-			i18n("Sessions define the appereance of the work area, \
-for example which windows are open and which texts should displayed in these windows. \
-New sessions only work after you've saved something into them.")
-		),
-		0,0,0,-1
-	);
-
-	m_settings.profiles.profiles = new QListBox(page);
-	gridLayout->addMultiCellWidget(m_settings.profiles.profiles, 1,1,0,-1);
-	gridLayout->setRowStretch(1,10);
-
-	m_settings.profiles.createProfile = new QPushButton(i18n("Create new session"), page);
-	connect(m_settings.profiles.createProfile, SIGNAL(clicked()), SLOT(addNewProfile()));
-  gridLayout->addWidget(m_settings.profiles.createProfile,2,0);
-
-	m_settings.profiles.deleteProfile = new QPushButton(i18n("Delete selected session"), page);
-	connect(m_settings.profiles.deleteProfile, SIGNAL(clicked()), SLOT(deleteProfile()));
-  gridLayout->addWidget(m_settings.profiles.deleteProfile,2,1);
-
-	m_settings.profiles.renameProfile = new QPushButton(i18n("Rename selected session"), page);
-	connect(m_settings.profiles.renameProfile, SIGNAL(clicked()), SLOT(renameProfile()));
-  gridLayout->addWidget(m_settings.profiles.renameProfile,2,2);
-
-  //fill the profile list box
-	QPtrList<CProfile> profiles = m_settings.profiles.mgr.profiles();
-	if (CProfile* p = profiles.first()) { //better than count
-		for (; p; p = profiles.next()) {
-			m_settings.profiles.profiles->insertItem(p->name());
-		}
-	}
-	else {
-		m_settings.profiles.profiles->setEnabled(false);
-	}
-}
-
-/** Init accel key section. */
-void COptionsDialog::initAccelerators(){
-  QVBox* page = addVBoxPage(i18n("Accelerators"),QString::null, DesktopIcon(CResMgr::settings::keys::icon,32));
-
-  KTabCtl* tabCtl = new KTabCtl(page);
-
-// ----- new tab: All display windows ------ //
-  QFrame* currentTab = new QVBox(tabCtl);
-	currentTab->setMargin(3);
-  tabCtl->addTab(currentTab, i18n("Application-wide"));
-
-	CBTConfig::setupAccel( CBTConfig::application, m_settings.keys.application.accel  );
-//	CSwordPresenter::insertKeyboardActions( m_settings.keys.application.accel );
-	m_settings.keys.application.accel->readSettings();
-
- 	m_settings.keys.application.keyChooser = new KKeyChooser( m_settings.keys.application.accel, currentTab, false );
-// 	QToolTip::add(m_settings.keys.application.keyChooser, TT_OD_KEYS_CHOOSER);
-//	QWhatsThis::add(m_settings.keys.application.keyChooser, WT_OD_KEYS_CHOOSER);
-
-// ----- new tab: All display windows ------ //
-	currentTab = new QVBox(tabCtl);
-	currentTab->setMargin(3);
-	tabCtl->addTab(currentTab, i18n("All display windows"));
-
-	m_settings.keys.general.accel = new KAccel(this); //delete in destructor
-	CBTConfig::setupAccel( CBTConfig::readWindow, m_settings.keys.general.accel  );
-	CReadWindow::insertKeyboardActions( m_settings.keys.general.accel );
-	m_settings.keys.general.accel->readSettings();
-
- 	m_settings.keys.general.keyChooser = new KKeyChooser( m_settings.keys.general.accel, currentTab );
-//	QToolTip::add(m_settings.keys.general.keyChooser, TT_OD_DISPLAY_WINDOW_KEYS_GENERAL);
-//	QWhatsThis::add(m_settings.keys.general.keyChooser, WT_OD_DISPLAY_WINDOW_KEYS_GENERAL);
-
-// ----- new tab: Bible windows ------ //
-	currentTab = new QVBox(tabCtl);
-	currentTab->setMargin(3);
-	tabCtl->addTab(currentTab, i18n("Bible windows"));
-
-	m_settings.keys.bible.accel = new KAccel(this); //delete in destructor
-	CBTConfig::setupAccel( CBTConfig::bibleWindow, m_settings.keys.bible.accel  );
-	CBibleReadWindow::insertKeyboardActions( m_settings.keys.bible.accel );
-	m_settings.keys.bible.accel->readSettings();
-
- 	m_settings.keys.bible.keyChooser = new KKeyChooser( m_settings.keys.bible.accel, currentTab/*, false*/ );
-//	QToolTip::add(m_settings.keys.bible.keyChooser, TT_OD_DISPLAY_WINDOW_KEYS_BIBLE);
-//	QWhatsThis::add(m_settings.keys.bible.keyChooser, WT_OD_DISPLAY_WINDOW_KEYS_BIBLE);
-
-// ----- new tab: Commentary windows ------ //
-	currentTab = new QVBox(tabCtl);
-	currentTab->setMargin(3);
-	tabCtl->addTab(currentTab, i18n("Commentary windows"));
-
-	m_settings.keys.commentary.accel = new KAccel(this); //delete in destructor
-	CBTConfig::setupAccel( CBTConfig::commentaryWindow, m_settings.keys.commentary.accel  );
-	CCommentaryReadWindow::insertKeyboardActions( m_settings.keys.commentary.accel );
-//	m_settings.keys.commentary.accel->setConfigGroup("Lexicon shortcuts");
-	m_settings.keys.commentary.accel->readSettings();
-
- 	m_settings.keys.commentary.keyChooser = new KKeyChooser( m_settings.keys.commentary.accel, currentTab, false );
-// 	QToolTip::add(m_settings.keys.commentary.keyChooser, TT_OD_DISPLAY_WINDOW_KEYS_COMMENTARY);
-//	QWhatsThis::add(m_settings.keys.commentary.keyChooser, WT_OD_DISPLAY_WINDOW_KEYS_COMMENTARY);
-
-// ----- new tab: Lexicon windows ------ //
-	currentTab = new QVBox(tabCtl);
-	currentTab->setMargin(3);
-	tabCtl->addTab(currentTab, i18n("Lexicon windows"));
-
-	m_settings.keys.lexicon.accel = new KAccel(this); //delete in destructor
-	CBTConfig::setupAccel( CBTConfig::lexiconWindow, m_settings.keys.lexicon.accel  );
-	CLexiconReadWindow::insertKeyboardActions( m_settings.keys.lexicon.accel );
-//	m_settings.keys.lexicon.accel->setConfigGroup("Lexicon shortcuts");
-	m_settings.keys.lexicon.accel->readSettings();
-
- 	m_settings.keys.lexicon.keyChooser = new KKeyChooser( m_settings.keys.lexicon.accel, currentTab, false );
-// 	QToolTip::add(m_settings.keys.lexicon.keyChooser, TT_OD_DISPLAY_WINDOW_KEYS_LEXICON);
-//	QWhatsThis::add(m_settings.keys.lexicon.keyChooser, WT_OD_DISPLAY_WINDOW_KEYS_LEXICON);
-
-
-// ----- new tab: Book windows ------ //
-	currentTab = new QVBox(tabCtl);
-	currentTab->setMargin(3);
-	tabCtl->addTab(currentTab, i18n("Book windows"));
-
-	m_settings.keys.book.accel = new KAccel(this); //delete in destructor
-	CBTConfig::setupAccel( CBTConfig::bookWindow, m_settings.keys.book.accel  );
-	CBookReadWindow::insertKeyboardActions( m_settings.keys.book.accel );
-//	m_settings.keys.book.accel->setConfigGroup("Book shortcuts");
-	m_settings.keys.book.accel->readSettings();
-
-	m_settings.keys.book.keyChooser = new KKeyChooser( m_settings.keys.book.accel, currentTab, false );
-// 	QToolTip::add(m_settings.keys.book.keyChooser, TT_OD_DISPLAY_WINDOW_KEYS_LEXICON);
-//	QWhatsThis::add(m_settings.keys.book.keyChooser, WT_OD_DISPLAY_WINDOW_KEYS_LEXICON);
-}
-
-/** Init Sword section. */
-void COptionsDialog::initSword(){
-	QVBox* page = addVBoxPage(i18n("Sword"),QString::null, DesktopIcon(CResMgr::settings::sword::icon,32));
-  KTabCtl* tabCtl = new KTabCtl(page);
-  QFrame* currentTab = new QFrame(tabCtl);
-  tabCtl->addTab(currentTab, i18n("General"));
-
-  QGridLayout* gridLayout = new QGridLayout(currentTab,7,2,5,5);
-	gridLayout->setResizeMode(QLayout::Minimum);
-
-  gridLayout->addMultiCellWidget(
-  	CToolClass::explanationLabel(currentTab, i18n("Use key cache for lexicons"),
-			i18n("BibleTime can create a key cache for lexicons. \
-This increases the speed of opening large lexicon modules significantly. \
-Note: These files consume some disk space (usually not much), and reside in \
-$KDEHOME/share/apps/bibletime/cache.")),
-		0,0,0,-1
-  );
-
-	m_settings.swords.lexiconCache = new QCheckBox(currentTab);
-	m_settings.swords.lexiconCache->setText(i18n("Use key cache for lexicons"));
-	QToolTip::add(m_settings.swords.lexiconCache, CResMgr::settings::sword::general::cacheKeys::tooltip);
-	QWhatsThis::add(m_settings.swords.lexiconCache, CResMgr::settings::sword::general::cacheKeys::whatsthis);
-
-	m_settings.swords.lexiconCache->setChecked( CBTConfig::get(CBTConfig::lexiconCache) );
- 	gridLayout->addMultiCellWidget(m_settings.swords.lexiconCache,1,1,0,-1);
-
-  gridLayout->addMultiCellWidget(
-  	CToolClass::explanationLabel(currentTab, i18n("Scrolling behaviour"),
-			i18n("The down arrow moves to the <i>next</i> verse by default. Uncheck this box \
-if you want it to move to the <i>previous</i> verse.")),
-		2,2,0,-1
-  );
-
- 	m_settings.swords.useDownArrow = new QCheckBox(currentTab);
- 	m_settings.swords.useDownArrow->setText(i18n("Use down arrow to scroll to next verse"));
- 	m_settings.swords.useDownArrow->setChecked(CBTConfig::get(CBTConfig::scroll));
- 	QToolTip::add(m_settings.swords.useDownArrow, CResMgr::settings::sword::general::scrolling::tooltip);
- 	QWhatsThis::add(m_settings.swords.useDownArrow, CResMgr::settings::sword::general::scrolling::whatsthis);
- 	gridLayout->addMultiCellWidget(m_settings.swords.useDownArrow,3,3,0,-1);
-
-  gridLayout->addMultiCellWidget(
-  	CToolClass::explanationLabel(currentTab, i18n("Specify a language for biblical booknames"),
-			i18n("Sword has a number of locales available which can be used to internationalize the \
-booknames of the bible. You can specify which locale to use. If you want to \
-create a new locale, see http://www.crosswire.org/sword/develop for details.")),
-		4,4,0,-1
-  );
-
- 	m_settings.swords.localeCombo = new QComboBox(currentTab);
- 	QLabel* label = new QLabel(m_settings.swords.localeCombo, i18n("Language for biblical booknames"), currentTab);
- 	QToolTip::add(m_settings.swords.localeCombo, CResMgr::settings::sword::general::language::tooltip);
- 	QWhatsThis::add(m_settings.swords.localeCombo, CResMgr::settings::sword::general::language::whatsthis);
- 	gridLayout->addWidget(label, 5,0);
- 	gridLayout->addWidget(m_settings.swords.localeCombo, 5,1);
-
- 	gridLayout->setRowStretch(6,5); //eat up remaining space :)
-
- 	m_settings.swords.localeCombo->insertItem( i18n("English") );
- 	const list<sword::SWBuf> locales = sword::LocaleMgr::systemLocaleMgr.getAvailableLocales();
- 	for (list<sword::SWBuf>::const_iterator it = locales.begin(); it != locales.end(); it++) {
- 		m_settings.swords.localeCombo->insertItem( i18n(sword::LocaleMgr::systemLocaleMgr.getLocale((*it).c_str())->getDescription()) );
- 	}
-
- 	int current_item = -1;
- 	for(int test_item = 0; test_item < m_settings.swords.localeCombo->count(); test_item++) {
- 		sword::SWLocale* locale = sword::LocaleMgr::systemLocaleMgr.getLocale(CBTConfig::get(CBTConfig::language).local8Bit());
- 		if (locale && (m_settings.swords.localeCombo->text(test_item) == i18n(locale->getDescription())) )
- 			current_item = test_item;
- 	}
- 	if (current_item!=-1)
- 		m_settings.swords.localeCombo->setCurrentItem(current_item);
-
-
-// ---------- new tab: Default modules -------- //
-  currentTab = new QFrame(tabCtl);
-  tabCtl->addTab(currentTab, i18n("Default modules"));
-	gridLayout = new QGridLayout(currentTab,10,2, 5,5); //the last row is for stretching available space
-	gridLayout->setResizeMode(QLayout::Minimum);
-
-  gridLayout->addMultiCellWidget(
-  	CToolClass::explanationLabel(currentTab, i18n("Default modules"),
-			i18n("Default modules are used when no module is specified, \
-for example when a hyperlink into a Bible or Lexicon was clicked .")),
-  	0,0,0,-1 /*fill the horizontal space*/
-  );
-
- 	m_settings.swords.standardBible = new QComboBox(currentTab);
-  label = new QLabel(m_settings.swords.standardBible, i18n("Default Bible"), currentTab);
-  label->setAutoResize(true);
- 	QToolTip::add(m_settings.swords.standardBible, CResMgr::settings::sword::modules::bible::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardBible, CResMgr::settings::sword::modules::bible::whatsthis);
- 	gridLayout->addWidget(label,1,0);
- 	gridLayout->addWidget(m_settings.swords.standardBible,1,1);
-
- 	m_settings.swords.standardCommentary = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardCommentary, i18n("Default Commentary"), currentTab);
-  label->setAutoResize(true);
- 	QToolTip::add(m_settings.swords.standardCommentary, CResMgr::settings::sword::modules::commentary::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardCommentary, CResMgr::settings::sword::modules::commentary::whatsthis);
- 	gridLayout->addWidget(label,2,0);
- 	gridLayout->addWidget(m_settings.swords.standardCommentary,2,1);
-
-
- 	m_settings.swords.standardLexicon = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardLexicon, i18n("Default Lexicon"), currentTab);
-  label->setAutoResize(true);
- 	QToolTip::add(m_settings.swords.standardLexicon, CResMgr::settings::sword::modules::lexicon::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardLexicon, CResMgr::settings::sword::modules::lexicon::whatsthis);
- 	gridLayout->addWidget(label,3,0);
- 	gridLayout->addWidget(m_settings.swords.standardLexicon,3,1);
-
- 	m_settings.swords.standardDailyDevotional = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardDailyDevotional, i18n("Default Daily Devotional"), currentTab);
-  label->setAutoResize(true);
- 	QToolTip::add(m_settings.swords.standardDailyDevotional, CResMgr::settings::sword::modules::dailyDevotional::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardDailyDevotional, CResMgr::settings::sword::modules::dailyDevotional::whatsthis);
- 	gridLayout->addWidget(label,4,0);
- 	gridLayout->addWidget(m_settings.swords.standardDailyDevotional,4,1);
-
- 	m_settings.swords.standardHebrewStrong = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardHebrewStrong, i18n("Default Hebrew Strong's Lexicon"), currentTab);
-  label->setAutoResize(true);
- 	QToolTip::add(m_settings.swords.standardHebrewStrong, CResMgr::settings::sword::modules::hebrewStrongs::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardHebrewStrong, CResMgr::settings::sword::modules::hebrewStrongs::whatsthis);
- 	gridLayout->addWidget(label,5,0);
- 	gridLayout->addWidget(m_settings.swords.standardHebrewStrong,5,1);
-
- 	m_settings.swords.standardGreekStrong = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardGreekStrong, i18n("Default Greek Strong's Lexicon"), currentTab);
-  label->setAutoResize(true);
- 	QToolTip::add(m_settings.swords.standardGreekStrong, CResMgr::settings::sword::modules::greekStrongs::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardGreekStrong, CResMgr::settings::sword::modules::greekStrongs::whatsthis);
- 	gridLayout->addWidget(label,6,0);
- 	gridLayout->addWidget(m_settings.swords.standardGreekStrong,6,1);
-		
- 	m_settings.swords.standardHebrewMorph = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardHebrewMorph, i18n("Default Hebrew Morphological Lexicon"), currentTab);
- 	QToolTip::add(m_settings.swords.standardHebrewMorph, CResMgr::settings::sword::modules::hebrewMorph::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardHebrewMorph, CResMgr::settings::sword::modules::hebrewMorph::whatsthis);
- 	gridLayout->addWidget(label,7,0);
- 	gridLayout->addWidget(m_settings.swords.standardHebrewMorph,7,1);
-
- 	m_settings.swords.standardGreekMorph = new QComboBox(currentTab);
- 	label = new QLabel(m_settings.swords.standardGreekMorph, i18n("Default Greek Morphological Lexicon"), currentTab);
-  label->setAutoResize(true); 	 	
- 	QToolTip::add(m_settings.swords.standardGreekMorph, CResMgr::settings::sword::modules::greekMorph::tooltip);
- 	QWhatsThis::add(m_settings.swords.standardGreekMorph, CResMgr::settings::sword::modules::greekMorph::whatsthis);
- 	gridLayout->addWidget(label,8,0);
- 	gridLayout->addWidget(m_settings.swords.standardGreekMorph,8,1);
-
- 	gridLayout->setRowStretch(9,5);							
-		
- 	//fill the comboboxes with the right modules
- 	ListCSwordModuleInfo& modules = backend()->moduleList();
-	QString modDescript;
-  for ( modules.first(); modules.current(); modules.next() ) {
-		modDescript = modules.current()->config(CSwordModuleInfo::Description);
- 		switch (modules.current()->type()) {
- 			case CSwordModuleInfo::Bible:
- 				m_settings.swords.standardBible->insertItem(modDescript);
- 				break;
- 			case CSwordModuleInfo::Commentary:
- 				m_settings.swords.standardCommentary->insertItem(modDescript);				
- 				break;
- 			case CSwordModuleInfo::Lexicon:
- 			{
-        bool inserted = false;
- 				if (modules.current()->has(CSwordModuleInfo::HebrewDef)) {
-					m_settings.swords.standardHebrewStrong->insertItem(modDescript);
-          inserted = true;          
- 				}
- 				if (modules.current()->has(CSwordModuleInfo::GreekDef)) {
-					m_settings.swords.standardGreekStrong->insertItem(modDescript);
-          inserted = true;
- 				}
- 				if (modules.current()->has(CSwordModuleInfo::HebrewParse)) {
-					m_settings.swords.standardHebrewMorph->insertItem(modDescript);				
-          inserted = true;
-        }
- 				if (modules.current()->has(CSwordModuleInfo::GreekParse)) {       
-					m_settings.swords.standardGreekMorph->insertItem(modDescript);
-          inserted = true;
- 				}
- 				if (modules.current()->category() == CSwordModuleInfo::DailyDevotional) {
-					m_settings.swords.standardDailyDevotional->insertItem(modDescript);
-          inserted = true;
- 				}
-				if (!inserted)//daily dvotionals, striong lexicons etc. are not very useful for word lookups
-          m_settings.swords.standardLexicon->insertItem(modDescript);
- 				break;
- 			} 				
- 			default://unknown type
- 				break;
- 		}
-  }
-
-//using two lists and one loop is better than six loops with almost the same code :)
- 	QPtrList<QComboBox> comboList;
- 	comboList.setAutoDelete(false);//don't delete the combos accidentally
- 	comboList.append(m_settings.swords.standardBible);
- 	comboList.append(m_settings.swords.standardCommentary);
- 	comboList.append(m_settings.swords.standardLexicon);
- 	comboList.append(m_settings.swords.standardDailyDevotional);  
- 	comboList.append(m_settings.swords.standardHebrewStrong);
- 	comboList.append(m_settings.swords.standardGreekStrong);
- 	comboList.append(m_settings.swords.standardHebrewMorph);
- 	comboList.append(m_settings.swords.standardGreekMorph);
-
- 	QStringList moduleList;
- 	moduleList
- 		<< CBTConfig::get(CBTConfig::standardBible)
-	 	<< CBTConfig::get(CBTConfig::standardCommentary)
-	 	<< CBTConfig::get(CBTConfig::standardLexicon)
-	 	<< CBTConfig::get(CBTConfig::standardDailyDevotional)    
-	 	<< CBTConfig::get(CBTConfig::standardHebrewStrongsLexicon)
-	 	<< CBTConfig::get(CBTConfig::standardGreekStrongsLexicon)
-	 	<< CBTConfig::get(CBTConfig::standardHebrewMorphLexicon)
-	 	<< CBTConfig::get(CBTConfig::standardGreekMorphLexicon);
-
- 	QString module = QString::null;
- 	int item = 0;
-	int count = 0; 	
- 	for (QComboBox* combo = comboList.first(); combo; combo = comboList.next() ) {		
-		module = moduleList[comboList.at()];
-		count = combo->count();
-	  combo->setMaximumWidth(300);
- 		for (item = 0; item < count; item++) {
-	 		if (combo->text(item) == module ) {
-	 		  combo->setCurrentItem(item);
-	 		  break;
-	 		}
-	 	}
-	}
-
-	
-
-// ---------- new tab: filters -------- //
-  currentTab = new QFrame(tabCtl);
-  tabCtl->addTab(currentTab, i18n("Filter settings"));
-  QVBoxLayout* layout = new QVBoxLayout(currentTab,5);
-
-  layout->addWidget( CToolClass::explanationLabel(currentTab, i18n("Filter settings"),
-		i18n("Filters control the appereance of the text in the display windows. \
-Here you can specify default settings for all filters. \
-You can change the filter settings in each display window, of course.")) );
-
-  layout->addSpacing(5);
-  		
- 	m_settings.swords.lineBreaks = new QCheckBox(currentTab);
- 	m_settings.swords.lineBreaks->setText(i18n("Insert line break after each verse"));
- 	m_settings.swords.lineBreaks->setChecked(CBTConfig::get(CBTConfig::lineBreaks));
-  QToolTip::add(m_settings.swords.lineBreaks, CResMgr::settings::sword::filters::lineBreaks::tooltip);
-  QWhatsThis::add(m_settings.swords.lineBreaks, CResMgr::settings::sword::filters::lineBreaks::whatsthis);  
- 	layout->addWidget(m_settings.swords.lineBreaks);
-
- 	m_settings.swords.verseNumbers = new QCheckBox(currentTab);
- 	m_settings.swords.verseNumbers->setText(i18n("Show verse numbers"));
- 	m_settings.swords.verseNumbers->setChecked(CBTConfig::get(CBTConfig::verseNumbers));		
-  QToolTip::add(m_settings.swords.verseNumbers, CResMgr::settings::sword::filters::verseNumbers::tooltip);
-  QWhatsThis::add(m_settings.swords.verseNumbers, CResMgr::settings::sword::filters::verseNumbers::whatsthis);
- 	layout->addWidget(m_settings.swords.verseNumbers);
-
- 	m_settings.swords.footnotes = new QCheckBox(currentTab);
- 	m_settings.swords.footnotes->setText(i18n("Show footnotes"));
- 	m_settings.swords.footnotes->setChecked(CBTConfig::get(CBTConfig::footnotes));		
-  QToolTip::add(m_settings.swords.footnotes, CResMgr::settings::sword::filters::footnotes::tooltip);
-  QWhatsThis::add(m_settings.swords.footnotes, CResMgr::settings::sword::filters::footnotes::whatsthis);
- 	layout->addWidget(m_settings.swords.footnotes);
-
- 	m_settings.swords.headings = new QCheckBox(currentTab);
- 	m_settings.swords.headings->setText(i18n("Show section headings"));
- 	m_settings.swords.headings->setChecked(CBTConfig::get(CBTConfig::headings));
-  QToolTip::add(m_settings.swords.headings, CResMgr::settings::sword::filters::headings::tooltip);
-  QWhatsThis::add(m_settings.swords.headings, CResMgr::settings::sword::filters::headings::whatsthis);
- 	layout->addWidget(m_settings.swords.headings);
-
- 	m_settings.swords.strongNumbers = new QCheckBox(currentTab);
- 	m_settings.swords.strongNumbers->setText(i18n("Show Strong's numbers"));
- 	m_settings.swords.strongNumbers->setChecked(CBTConfig::get(CBTConfig::strongNumbers));
-  QToolTip::add(m_settings.swords.strongNumbers, CResMgr::settings::sword::filters::strongsNumbers::tooltip);
-  QWhatsThis::add(m_settings.swords.strongNumbers, CResMgr::settings::sword::filters::strongsNumbers::whatsthis);  
- 	layout->addWidget(m_settings.swords.strongNumbers);
-
- 	m_settings.swords.scriptureReferences = new QCheckBox(currentTab);
- 	m_settings.swords.scriptureReferences->setText(i18n("Show scripture cross-references"));
- 	m_settings.swords.scriptureReferences->setChecked(CBTConfig::get(CBTConfig::hebrewCantillation));
-//Enable this in 1.4, because we're in message freeze for 1.3
-//  QToolTip::add(m_settings.swords.scriptureReferences, CResMgr::settings::sword::filters::crossReferences::tooltip);
-//  QWhatsThis::add(m_settings.swords.scriptureReferences, CResMgr::settings::sword::filters::crossReferences::whatsthis);
- 	layout->addWidget(m_settings.swords.scriptureReferences);
-
-  m_settings.swords.morphTags = new QCheckBox(currentTab);
- 	m_settings.swords.morphTags->setText(i18n("Show morphologic tags"));
- 	m_settings.swords.morphTags->setChecked(CBTConfig::get(CBTConfig::morphTags));
-  QToolTip::add(m_settings.swords.morphTags, CResMgr::settings::sword::filters::morphTags::tooltip);
-  QWhatsThis::add(m_settings.swords.morphTags, CResMgr::settings::sword::filters::morphTags::whatsthis);
- 	layout->addWidget(m_settings.swords.morphTags);
-
- 	m_settings.swords.lemmas = new QCheckBox(currentTab);
- 	m_settings.swords.lemmas->setText(i18n("Show lemmas"));
- 	m_settings.swords.lemmas->setChecked(CBTConfig::get(CBTConfig::lemmas));
-  QToolTip::add(m_settings.swords.lemmas, CResMgr::settings::sword::filters::lemmas::tooltip);
-  QWhatsThis::add(m_settings.swords.lemmas, CResMgr::settings::sword::filters::lemmas::whatsthis);
- 	layout->addWidget(m_settings.swords.lemmas);
-		
-  m_settings.swords.greekAccents = new QCheckBox(currentTab);
- 	m_settings.swords.greekAccents->setText(i18n("Show Greek accents"));
- 	m_settings.swords.greekAccents->setChecked(CBTConfig::get(CBTConfig::greekAccents));
-  QToolTip::add(m_settings.swords.greekAccents, CResMgr::settings::sword::filters::greekAccents::tooltip);
-  QWhatsThis::add(m_settings.swords.greekAccents, CResMgr::settings::sword::filters::greekAccents::whatsthis);
- 	layout->addWidget(m_settings.swords.greekAccents);
-
- 	m_settings.swords.hebrewPoints = new QCheckBox(currentTab);
- 	m_settings.swords.hebrewPoints->setText(i18n("Show Hebrew vowel points"));
- 	m_settings.swords.hebrewPoints->setChecked(CBTConfig::get(CBTConfig::hebrewPoints));
-  QToolTip::add(m_settings.swords.hebrewPoints, CResMgr::settings::sword::filters::hebrewVowelPoints::tooltip);
-  QWhatsThis::add(m_settings.swords.hebrewPoints, CResMgr::settings::sword::filters::hebrewVowelPoints::whatsthis);  
- 	layout->addWidget(m_settings.swords.hebrewPoints);
-
- 	m_settings.swords.hebrewCantillation = new QCheckBox(currentTab);
- 	m_settings.swords.hebrewCantillation->setText(i18n("Show Hebrew cantillation marks"));
- 	m_settings.swords.hebrewCantillation->setChecked(CBTConfig::get(CBTConfig::hebrewCantillation));		
-  QToolTip::add(m_settings.swords.hebrewCantillation, CResMgr::settings::sword::filters::hebrewCantillation::tooltip);
-  QWhatsThis::add(m_settings.swords.hebrewCantillation, CResMgr::settings::sword::filters::hebrewCantillation::whatsthis);
- 	layout->addWidget(m_settings.swords.hebrewCantillation);
-
- 	m_settings.swords.textualVariants = new QCheckBox(currentTab);
- 	m_settings.swords.textualVariants->setText(i18n("Use textual variants"));
- 	m_settings.swords.textualVariants->setChecked(CBTConfig::get(CBTConfig::textualVariants));		
-  QToolTip::add(m_settings.swords.textualVariants, CResMgr::settings::sword::filters::textualVariants::tooltip);
-  QWhatsThis::add(m_settings.swords.textualVariants, CResMgr::settings::sword::filters::textualVariants::whatsthis);
- 	layout->addWidget(m_settings.swords.textualVariants);
- 		
-	layout->addStretch(4);	
-}
-
-void COptionsDialog::saveAccelerators(){
-//#warning check
-// 	m_settings.keys.application.accel->writeSettings();
-// 	m_settings.keys.application.keyChooser->save();
- 	m_settings.keys.application.keyChooser->commitChanges();
-	m_settings.keys.application.accel->writeSettings(); 	
-
-// 	m_settings.keys.general.accel->writeSettings();
-//		
-// 	m_settings.keys.bible.accel->writeSettings();		
-// 	m_settings.keys.bible.keyChooser->save();
- 	m_settings.keys.bible.keyChooser->commitChanges();
-	m_settings.keys.bible.accel->writeSettings();
-
-//		
-// 	m_settings.keys.commentary.accel->writeSettings();
-// 	m_settings.keys.commentary.keyChooser->save();
- 	m_settings.keys.commentary.keyChooser->commitChanges();
-	m_settings.keys.commentary.accel->writeSettings(); 	
-
-		
-// 	m_settings.keys.lexicon.accel->writeSettings();
-// 	m_settings.keys.lexicon.keyChooser->save();
- 	m_settings.keys.lexicon.keyChooser->commitChanges();
-	m_settings.keys.lexicon.accel->writeSettings(); 	
-
-// 	m_settings.keys.book.accel->writeSettings(); 	 	
-// 	m_settings.keys.book.keyChooser->save();
- 	m_settings.keys.book.keyChooser->commitChanges();
-	m_settings.keys.book.accel->writeSettings();
-}
-
-/** No descriptions */
-void COptionsDialog::saveColors(){
- 	CBTConfig::set(CBTConfig::textColor, m_settings.colors.text->color().name());	
- 	CBTConfig::set(CBTConfig::backgroundColor, m_settings.colors.background->color().name());	
- 	CBTConfig::set(CBTConfig::highlightedVerseColor, m_settings.colors.highlightedVerse->color().name());		
- 	CBTConfig::set(CBTConfig::swordRefColor, m_settings.colors.swordrefs->color().name());		
- 	CBTConfig::set(CBTConfig::footnotesColor, m_settings.colors.footnotes->color().name());		
- 	CBTConfig::set(CBTConfig::strongsColor, m_settings.colors.strongs->color().name());		
- 	CBTConfig::set(CBTConfig::morphsColor, m_settings.colors.morph->color().name());		
- 	CBTConfig::set(CBTConfig::jesuswordsColor, m_settings.colors.jesuswords->color().name());		
-}
-
-/** No descriptions */
-void COptionsDialog::saveFonts(){
-	for(QMap<QString, CBTConfig::FontSettingsPair>::Iterator it = m_settings.fonts.fontMap.begin(); it != m_settings.fonts.fontMap.end(); ++it ) {
-    CLanguageMgr::Language lang = languageMgr()->languageForTranslatedName(it.key());
-    if (!lang.isValid()) { //we probably use a language, for which we have only the abbrev
-      lang = CLanguageMgr::Language(it.key(), it.key(), it.key());
-    }
-    CBTConfig::set(lang, it.data());
- 	}
-}
-
-/** No descriptions */
-void COptionsDialog::saveProfiles(){
-}
-
-/** No descriptions */
-void COptionsDialog::saveStartup(){
-	CBTConfig::set( CBTConfig::logo, m_settings.startup.showLogo->isChecked() );	
- 	CBTConfig::set( CBTConfig::tips, m_settings.startup.showTips->isChecked() );				
- 	CBTConfig::set( CBTConfig::restoreWorkspace, m_settings.startup.restoreWorkspace->isChecked() );	
-}
-
-/** No descriptions */
-void COptionsDialog::saveSword(){
-  bool old_lexiconCache = CBTConfig::get(CBTConfig::lexiconCache);
-  bool new_lexiconCache = m_settings.swords.lexiconCache->isChecked();
-
-  CBTConfig::set( CBTConfig::lexiconCache, new_lexiconCache );
-
-  if (old_lexiconCache && !new_lexiconCache){  //delete cache files
-  	QString dirname = KGlobal::dirs()->saveLocation("data", "bibletime/cache/");
-  	QDir dir = QDir(dirname);
-   	QStringList files = QStringList( dir.entryList() );
-   	for (QStringList::Iterator it = files.begin(); it != files.end(); ++it)
-   		dir.remove((*it),false);
-  }
-
-  CBTConfig::set(CBTConfig::standardBible, m_settings.swords.standardBible->currentText());
-  CBTConfig::set(CBTConfig::standardCommentary, m_settings.swords.standardCommentary->currentText());
-  CBTConfig::set(CBTConfig::standardLexicon, m_settings.swords.standardLexicon->currentText());
-  CBTConfig::set(CBTConfig::standardDailyDevotional, m_settings.swords.standardDailyDevotional->currentText());
-  CBTConfig::set(CBTConfig::standardHebrewStrongsLexicon, m_settings.swords.standardHebrewStrong->currentText());
-  CBTConfig::set(CBTConfig::standardGreekStrongsLexicon, m_settings.swords.standardGreekStrong->currentText() );
-  CBTConfig::set(CBTConfig::standardHebrewMorphLexicon, m_settings.swords.standardHebrewMorph->currentText());
-  CBTConfig::set(CBTConfig::standardGreekMorphLexicon, m_settings.swords.standardGreekMorph->currentText() );
-
- 	const QString currentText = m_settings.swords.localeCombo->currentText();
- 	list <sword::SWBuf> locales = sword::LocaleMgr::systemLocaleMgr.getAvailableLocales();
- 	QString localeName = QString::null;
- 	for (list <sword::SWBuf>::iterator it = locales.begin(); it != locales.end(); it++) {
- 		if ( i18n(sword::LocaleMgr::systemLocaleMgr.getLocale((*it).c_str())->getDescription()) == currentText ) {
- 			localeName = (*it).c_str();	//we found the abbrevation for the current language
- 			break;
- 		}
- 	}
- 	if (!localeName.isEmpty()) {
- 		CBTConfig::set(CBTConfig::language, localeName);
-	}
- 	else {
- 		CBTConfig::set(CBTConfig::language, currentText);
-	}
-
- 	CBTConfig::set(CBTConfig::scroll, m_settings.swords.useDownArrow->isChecked());
- 	CBTConfig::set(CBTConfig::lineBreaks, m_settings.swords.lineBreaks->isChecked());
- 	CBTConfig::set(CBTConfig::verseNumbers, m_settings.swords.verseNumbers->isChecked());
- 	CBTConfig::set(CBTConfig::footnotes, m_settings.swords.footnotes->isChecked());
- 	CBTConfig::set(CBTConfig::strongNumbers, m_settings.swords.strongNumbers->isChecked());
- 	CBTConfig::set(CBTConfig::headings, m_settings.swords.headings->isChecked());
- 	CBTConfig::set(CBTConfig::scriptureReferences, m_settings.swords.scriptureReferences->isChecked());
- 	CBTConfig::set(CBTConfig::morphTags, m_settings.swords.morphTags->isChecked());
- 	CBTConfig::set(CBTConfig::lemmas, m_settings.swords.lemmas->isChecked());
- 	CBTConfig::set(CBTConfig::hebrewPoints, m_settings.swords.hebrewPoints->isChecked());
- 	CBTConfig::set(CBTConfig::hebrewCantillation, m_settings.swords.hebrewCantillation->isChecked());
- 	CBTConfig::set(CBTConfig::greekAccents, m_settings.swords.greekAccents->isChecked());
- 	CBTConfig::set(CBTConfig::textualVariants, m_settings.swords.textualVariants->isChecked());
-}
-
-/** This slot is called when the "Use own font for language" bo was clicked. */
-void COptionsDialog::useOwnFontClicked( bool isOn){
-  m_settings.fonts.fontChooser->setEnabled(isOn);
-  m_settings.fonts.fontMap[ m_settings.fonts.usage->currentText() ].first = isOn;
-
-  if (isOn) { //show font icon
-    m_settings.fonts.usage->changeItem(SmallIcon("fonts"), m_settings.fonts.usage->currentText(), m_settings.fonts.usage->currentItem() );
-  }
-  else {    //don't show
-    m_settings.fonts.usage->changeItem(m_settings.fonts.usage->currentText(), m_settings.fonts.usage->currentItem() );
-  }
-}
diff --git a/bibletime/frontend/coptionsdialog.h b/bibletime/frontend/coptionsdialog.h
deleted file mode 100644
index ca52da8..0000000
--- a/bibletime/frontend/coptionsdialog.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/***************************************************************************
-                          coptionsdialog.h  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef COPTIONSDIALOG_H
-#define COPTIONSDIALOG_H
-
-#include "cprofilemgr.h"
-#include "cbtconfig.h"
-#include "util/cpointers.h"
-
-//QT includes
-#include <qwidget.h>
-#include <qframe.h>
-#include <qlabel.h>
-#include <qstring.h>
-#include <qmap.h>
-#include <qcombobox.h>
-#include <qdict.h>
-#include <qmap.h>
-
-//KDE includes
-#include <kdialogbase.h>
-#include <kfontdialog.h>
-#include <kaccel.h>
-#include <kcolorbutton.h>
-#include <kapp.h>
-
-class QHBox;
-class QCheckBox;
-class QRadioButton;
-class KListBox;
-class KKeyChooser;
-class KTabCtl;
-
-/**
-	* The optionsdialog of BibleTime
-  * @author The BibleTime Team
-  */
-class COptionsDialog : public KDialogBase, public CPointers  {
-   Q_OBJECT
-
-public:
-	COptionsDialog(QWidget *parent=0, const char *name=0, KAccel* key_accel=0);
-
-  enum Parts {
-		Startup,
-		Font,		
-		Color,		
-		ViewProfiles,
-		Sword,
-		accelerators
-  };
-
-  /** Opens the page which contaisn the given part ID. */
-  const bool showPart( COptionsDialog::Parts ID );
-
-private:
-  struct settings {
-	 	struct StartupSettings {
-	 		QCheckBox* showTips;
-	 		QCheckBox* showLogo;
-	 		QCheckBox* restoreWorkspace;
-	 	} startup;
-		
-		struct SwordSettings {
-			QCheckBox* lexiconCache;
-			QComboBox* standardBible;
-			QComboBox* standardCommentary;
-			QComboBox* standardLexicon;
-			QComboBox* standardDailyDevotional;
-			QComboBox* standardHebrewStrong;
-			QComboBox* standardGreekStrong;
-			QComboBox* standardHebrewMorph;
-			QComboBox* standardGreekMorph;
-			QComboBox* localeCombo;
-			QCheckBox* useDownArrow;
-			QCheckBox* lineBreaks;
-			QCheckBox* verseNumbers;
-			QCheckBox* footnotes;
-  		QCheckBox* strongNumbers;
-  		QCheckBox* headings;
-  		QCheckBox* morphTags;
-			QCheckBox* lemmas;
-			QCheckBox* hebrewPoints;
-			QCheckBox* hebrewCantillation;
-			QCheckBox* greekAccents;
-			QCheckBox* textualVariants;
-      QCheckBox* scriptureReferences;
-		} swords; // not: sword -> namespace error
-		
-		struct KeySettings {
-			struct WindowType {
-				KKeyChooser* keyChooser;
-				KAccel* accel;
-			};
-			WindowType application;
-			WindowType general;
-			WindowType bible;
-			WindowType commentary;
-			WindowType lexicon;
-			WindowType book;
-		} keys;
-		
-		struct ColorSettings {
-			KColorButton* text;
-			KColorButton* background;
-//			KColorButton* background2;
-			KColorButton* highlightedVerse;
-			KColorButton* swordrefs;
-			KColorButton* footnotes;
-			KColorButton* strongs;
-			KColorButton* morph;
-			KColorButton* jesuswords;
-		} colors;
-		
-    struct FontSettings {		
-			KFontChooser* fontChooser;
-			QComboBox* usage;
-      QCheckBox* useOwnFontBox;
-      //the pair os to check whether the standard font (bool == false) or whether an own font should be used (true)
-      QMap<QString,CBTConfig::FontSettingsPair> fontMap;
-		} fonts;
-		
-		struct ProfileSettings {
-			QListBox* profiles;
-			QPushButton* createProfile;			
-			QPushButton* deleteProfile;
-			QPushButton* renameProfile;
-			CProfileMgr mgr;
-		} profiles;
-  } m_settings;
-
-protected slots: // Protected slots
-  /**
-  * Adds a new view profile to the list.
-  */
-  void addNewProfile();
-  /**
-  * Called when a new font in the fonts page was selected.
-  */
-  void newDisplayWindowFontSelected(const QFont &);
-  /**
-  * Called when the combobox contents is changed
-  */
-  void newDisplayWindowFontAreaSelected(const QString&);
-	/**
-	* Called if the OK button was clicked
-	*/
-  void slotOk();
-  /**
- 	* Called if the Apply button was clicked
- 	* commented out for the time being.  ck
- 	*/
-	void slotApply();
-  /**
-  * Renames the currently selected profile.
-  */
-  void renameProfile();
-  /**
-  * Delete the selected profile.
-  */
-  void deleteProfile();
-  /**
-  * This slot is called when the "Use own font for language" bo was clicked.
-  */
-  void useOwnFontClicked(bool);
-
-protected: // Protected methods
-  /**
-  * Init Sword section.
-  */
-  void initSword();
-  /**
-  * Init accel key section.
-  */
-  void initAccelerators();
-  /**
-  * Init fonts section.
-  */
-  void initFonts();
-  /**
-  * Init profiles section.
-  */
-  void initProfiles();
-  /**
-  * Init color section.
-  */
-  void initColors();
-  /**
-  * Initializes the startup section of the OD.
-  */
-  void initStartup();
-  void saveAccelerators();
-	void saveColors();
-	void saveFonts();
- 	void saveProfiles();
- 	void saveStartup();
- 	void saveSword();
-
-signals: // Signals
-  void signalSettingsChanged();
-};
-
-#endif
diff --git a/bibletime/frontend/cprofile.cpp b/bibletime/frontend/cprofile.cpp
deleted file mode 100644
index 54eb79c..0000000
--- a/bibletime/frontend/cprofile.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-/***************************************************************************
-                          cprofile.cpp  -  description
-                             -------------------
-    begin                : Sun Jul 29 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cprofile.h"
-
-//Qt includes
-#include <qdom.h>
-#include <qfile.h>
-#include <qstring.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-
-//KDE includes
-#include <kstandarddirs.h>
-#include <klocale.h>
-
-#define CURRENT_SYNTAX_VERSION 2
-
-CProfile::CProfile( const QString& file, const QString& name ):
-	m_name(name.isEmpty() ? i18n("unknown") : name),
-	m_filename(file),
-	m_fullscreen(false),
-	m_geometry(10,20,640,480)
-{
-	
-	m_profileWindows.setAutoDelete(true);
-	if (!m_filename.isEmpty() && name.isEmpty()) {
-		loadBasics();
-	}
-	else if (m_filename.isEmpty() && !name.isEmpty()) {
-		m_filename = name;
-		m_filename.replace(QRegExp("\\s=#."),"_");
-		KStandardDirs stdDirs;
-		m_filename = stdDirs.saveLocation("data", "bibletime/sessions/") + m_filename + ".xml";
-		init(m_filename);
-	}
-	else {
-		qWarning("CProfile: empty file name!");
-  }
-}
-
-CProfile::~CProfile(){
-	m_profileWindows.clear(); 	//delete all CProfileWindows objects (autodelete is enabled)
-}
-
-/** Loads the profile from the file given in the constructor. */
-QPtrList<CProfileWindow> CProfile::load(){
-	QFile file(m_filename);	
-	if (!file.exists())
-		return QPtrList<CProfileWindow>();
-	
-	QDomDocument doc;	
-	if (file.open(IO_ReadOnly)) {		
-		QTextStream t( &file );
-		t.setEncoding(QTextStream::UnicodeUTF8);
-		doc.setContent(t.read());
-		file.close();	
-	}
-	
-  QDomElement document = doc.documentElement();
-  if( document.tagName() != "BibleTimeProfile" && document.tagName() != "BibleTime" ) { //BibleTime was used in syntax version 1.0
-		qWarning("CProfile::load: Missing BibleTime doc");
-		return m_profileWindows;
-	}
-	if (document.hasAttribute("name")) {
-		m_name = document.attribute("name");	
-	}
-
-	
-	//load settings of the main window
-	{
-		// see if there's a section with the name MAINWINDOW
-		QDomElement elem = document.firstChild().toElement();		
-		QDomElement mainWindow;
-		while (!elem.isNull()) {
-			if (elem.tagName() == "MAINWINDOW") {
-				mainWindow = elem;
-				break; //found the element
-			}
-			elem = elem.nextSibling().toElement();				
-		}		
-		if (!mainWindow.isNull()) { //was found
-			setFullscreen( (bool)mainWindow.attribute("fullscreen").toInt());
-			QDomElement object = mainWindow.namedItem("GEOMETRY").toElement();
-			QRect rect;
-      if(!object.isNull()) {
-				if (object.hasAttribute("x")) {
-					rect.setX(object.attribute("x").toInt());
-				}
-				if (object.hasAttribute("y")) {
-					rect.setY(object.attribute("y").toInt());
-				}
-				if (object.hasAttribute("width")) {
-					rect.setWidth(object.attribute("width").toInt());
-				}
-				if (object.hasAttribute("height")) {
-					rect.setHeight(object.attribute("height").toInt());
-				}
-			}
-			setGeometry(rect);			
-		}
-	}
-		
-	m_profileWindows.clear();
-	QDomElement elem = document.firstChild().toElement();
-	while (!elem.isNull()) {
-		CProfileWindow* p = 0;		
-		if (elem.tagName() == "BIBLE") {
-			p = new CProfileWindow(CSwordModuleInfo::Bible);
-		}
-		else if (elem.tagName() == "COMMENTARY") {
-			p = new CProfileWindow(CSwordModuleInfo::Commentary);
-		}
-		else if (elem.tagName() == "LEXICON") {
-			p = new CProfileWindow(CSwordModuleInfo::Lexicon);
-		}			
-		else if (elem.tagName() == "BOOK") {
-			p = new CProfileWindow(CSwordModuleInfo::GenericBook);
-		}			
-		
-		if (p) {
-			m_profileWindows.append(p);
-			
-			if (elem.hasAttribute("windowSettings")) {
-				p->setWindowSettings( elem.attribute("windowSettings").toInt() );
-			}
-			if (elem.hasAttribute("writeWindowType")) {
-				p->setWriteWindowType( elem.attribute("writeWindowType").toInt() );
-			}
-			if (elem.hasAttribute("hasFocus")) {
-				p->setFocus( static_cast<bool>(elem.attribute("hasFocus").toInt()) );
-			}
-			
-			QRect rect;
-						
-			QDomElement object = elem.namedItem("GEOMETRY").toElement();
-      if(!object.isNull()) {
-				if (object.hasAttribute("x")) {
-					rect.setX(object.attribute("x").toInt());
-				}
-				if (object.hasAttribute("y")) {
-					rect.setY(object.attribute("y").toInt());
-				}
-				if (object.hasAttribute("width")) {
-					rect.setWidth(object.attribute("width").toInt());
-				}
-				if (object.hasAttribute("height")) {
-					rect.setHeight(object.attribute("height").toInt());
-				}
-				if (object.hasAttribute("isMaximized")) {
-					p->setMaximized( static_cast<bool>(object.attribute("isMaximized").toInt()) );
-				}				
-			}
-			p->setGeometry(rect);
-			
-			object = elem.namedItem("MODULES").toElement();
-      if(!object.isNull()) {				
-				if (object.hasAttribute("list")) {
-					const QString sep = object.hasAttribute("separator") ? object.attribute("separator") : "|";
-					QStringList modules = QStringList::split(sep, object.attribute("list"));
-					p->setModules(modules);
-				}
-      }
-
-			object = elem.namedItem("KEY").toElement();
-      if(!object.isNull()) {
-      	if (object.hasAttribute("name"))
-					p->setKey(object.attribute("name"));
-      }				
-				
-			object = elem.namedItem("SCROLLBARS").toElement();
-      if(!object.isNull()) {
-      	int horizontal = 0, vertical = 0;
-      	if (object.hasAttribute("horizontal"))
-      		horizontal = object.attribute("horizontal").toInt();
-      	if (object.hasAttribute("vertical"))
-      		vertical = object.attribute("vertical").toInt();
-
-				p->setScrollbarPositions(horizontal, vertical);      	
-      }				
-		}				
-		elem = elem.nextSibling().toElement();	
-	}
-	return m_profileWindows;
-}
-
-/** Saves the profile to the file given in the constructor. */
-const bool CProfile::save(QPtrList<CProfileWindow> windows){
-	/** Save the settings using a XML file
-	*	Save the CProfileWindow objects using a XML file which name is in m_filename
-	*/
-	bool ret = false;
-  QDomDocument doc("DOC");
-  doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-
-  QDomElement content = doc.createElement("BibleTimeProfile");
-  content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION);
-  content.setAttribute("name", m_name);
-  doc.appendChild(content);
-
-  //save mainwindow settings
-	{
-	 	QDomElement mainWindow = doc.createElement("MAINWINDOW");
-  	mainWindow.setAttribute("fullscreen", fullscreen());
-  	
-  	QDomElement geometry = doc.createElement("GEOMETRY");
-  	mainWindow.appendChild(geometry);
-  	const QRect r = this->geometry();
-  	geometry.setAttribute("x",r.x());
-  	geometry.setAttribute("y",r.y());		
-  	geometry.setAttribute("width",r.width());		
-  	geometry.setAttribute("height",r.height());		
-
-		content.appendChild(mainWindow);
-	}
-
-	for (CProfileWindow* p = windows.first(); p; p = windows.next()) {
-		QDomElement window;
-		switch (p->type()) {
-			case CSwordModuleInfo::Bible:
-				window = doc.createElement("BIBLE");	
-				break;
-			case CSwordModuleInfo::Commentary:
-				window = doc.createElement("COMMENTARY");	
-				break;
-			case CSwordModuleInfo::Lexicon:
-				window = doc.createElement("LEXICON");	
-				break;
-			case CSwordModuleInfo::GenericBook:
-				window = doc.createElement("BOOK");	
-				break;
-			default:
-				break;
-		}
-		if (window.isNull())
-			break;
-		window.setAttribute("windowSettings", p->windowSettings());
-		window.setAttribute("writeWindowType", p->writeWindowType());    
-		window.setAttribute("hasFocus", p->hasFocus());
-		
-		//save geomtery
-		const QRect r = p->geometry();
-		QDomElement geometry = doc.createElement("GEOMETRY");
-		geometry.setAttribute("x",r.x());
-		geometry.setAttribute("y",r.y());		
-		geometry.setAttribute("width",r.width());		
-		geometry.setAttribute("height",r.height());		
-		geometry.setAttribute("isMaximized",static_cast<int>(p->maximized()));
-		window.appendChild( geometry );
-
-		QDomElement modules = doc.createElement("MODULES");
-		modules.setAttribute("separator", "|");
-		modules.setAttribute("list", p->modules().join("|"));
-		window.appendChild( modules );		
-
-		QDomElement key = doc.createElement("KEY");
-		key.setAttribute("name", p->key());
-		window.appendChild( key );		
-
-		QDomElement scrollbars = doc.createElement("SCROLLBARS");
-		scrollbars.setAttribute("horizontal", p->scrollbarPositions().horizontal);
-		scrollbars.setAttribute("vertical", p->scrollbarPositions().vertical);		
-		window.appendChild( scrollbars );		
-						
-		content.appendChild( window );
-	}		
-	
-	QFile file(m_filename);
-	if ( file.open(IO_WriteOnly) ) {
-		ret = true;
-		QTextStream t( &file );
-		t.setEncoding(QTextStream::UnicodeUTF8);
-		t << doc.toString();
-		file.close();
-	}
-	else
-		ret = false;
-
-	return ret;
-}
-
-/** Saves the profile to the file given in the constructor. */
-const bool CProfile::save(){
-	return save(m_profileWindows);
-}
-
-/** Returns the filename used for this profile. */
-const QString& CProfile::filename(){
-	return m_filename;
-}
-
-/** Returns the name of this profile. */
-const QString& CProfile::name(){
-	return m_name;
-}
-
-/** Initializes the XML for the first time (use to create a new profile) */
-void CProfile::init(const QString file){
-	const QString oldFile = m_filename;
-	m_filename = file;
-	save(QPtrList<CProfileWindow>());
-	m_filename = oldFile;
-}
-
-/** Changes the name of this profile. */
-void CProfile::setName( const QString& newName ){
-	m_name = newName;
-	saveBasics(); //save chanegd name
-}
-
-/** Loads the basic settings requires for proper operation. */
-void CProfile::loadBasics(){
-	QFile file(m_filename);	
-	if (!file.exists())
-		return;
-
-	QDomDocument doc;	
-	if (file.open(IO_ReadOnly)) {
-		QTextStream t( &file );
-		t.setEncoding(QTextStream::UnicodeUTF8);
-		doc.setContent(t.read());
-		file.close();			
-	}
-  QDomElement document = doc.documentElement();
-	if (document.hasAttribute("name"))
-		m_name = document.attribute("name");
-}
-
-void CProfile::saveBasics(){
-	QFile file(m_filename);	
-	if (!file.exists())
-		return;
-
-	QDomDocument doc;	
-	if (file.open(IO_ReadOnly)) {
-		QTextStream t(&file);
-		t.setEncoding(QTextStream::UnicodeUTF8);
-		doc.setContent(t.read());
-		file.close();	
-	}
-	
-  QDomElement document = doc.documentElement();
-	document.setAttribute("name", m_name);	
-	
-	if (file.open(IO_WriteOnly)) {	
-		QTextStream t( &file );
-		t.setEncoding(QTextStream::UnicodeUTF8);
-		t << doc.toString();	
-		file.close();	
-	}
-}
-
-/** Returns true if the main window was in fullscreen mode as the profile was saved. */
-const bool CProfile::fullscreen() const {
-	return m_fullscreen;
-}
-
-/** Set the parameter to true if the main window coveres the full screen size. */
-void CProfile::setFullscreen( const bool fullscreen ){
-	m_fullscreen = fullscreen;
-}
-
-/** Returns the geometry of the main window */
-const QRect CProfile::geometry(){
-	return m_geometry;
-}
-
-/** Stes the geoemtry of the main window */
-void CProfile::setGeometry( const QRect rect ){
-	m_geometry = rect;
-}
diff --git a/bibletime/frontend/cprofile.h b/bibletime/frontend/cprofile.h
deleted file mode 100644
index e322401..0000000
--- a/bibletime/frontend/cprofile.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/***************************************************************************
-                          cprofile.h  -  description
-                             -------------------
-    begin                : Sun Jul 29 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPROFILE_H
-#define CPROFILE_H
-
-#include "cprofilewindow.h"
-
-//Qt includes
-#include <qptrlist.h>
-
-/**	Manages one profile file. Provides functions to save and restore settings of the available display windows.
-  *	@author The BibleTime team
-  */
-class CProfile {
-public: 
-	CProfile(const QString& fileName, const QString& name = QString::null);
-	~CProfile();
-
-  /**
-  * Saves the profile to the file given in the constructor.
-  * @param windows The list of windows available in the profile.
-  */
-  const bool save( QPtrList<CProfileWindow> windows );
-  /**
-  * Saves the profile to the file given in the constructor.
-  */
-  const bool save();
-  /**
-  * Loads the profile from the file given in the constructor.
-  * @return The list of profiled window which exist in the profile.
-  */
- 	QPtrList<CProfileWindow> load();
-  /**
-  * Returns the name of this profile.
-  */
-  const QString& name();
-  /**
-  * Returns the filename used for this profile.
-  */
-  const QString& filename();
-  /**
-  * Initializes the XML for the first time (use to create a new profile)
-  */
-  void init(const QString);
-  /**
-  * Chnages the name of this profile.
-  */
-  void setName( const QString& );
-  /**
-  * Set the parameter to true if the main window coveres the full screen size.
-  */
-  void setFullscreen( const bool fullscreen );
-  /**
-  * Returns true if the main window was in fullscreen mode as the profile was saved.
-  */
-  const bool fullscreen() const;
-  /**
-  * Sets the geoemtry of the main window
-  */
-  void setGeometry( const QRect rect );
-  /**
-  * Returns the geometry of the main window
-  */
-  const QRect geometry();
-		
-private:
-  /**
-  * Loads the basic settings requires for proper operation.
-  */
-  void loadBasics();
-  void saveBasics();
-	
-	QPtrList<CProfileWindow> m_profileWindows;
-	QString m_name;
-	QString m_filename;
-	bool m_fullscreen;
-	QRect m_geometry;
-};
-
-#endif
diff --git a/bibletime/frontend/cprofilemgr.cpp b/bibletime/frontend/cprofilemgr.cpp
deleted file mode 100644
index 542f20c..0000000
--- a/bibletime/frontend/cprofilemgr.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-/***************************************************************************
-                          cprofilemgr.cpp  -  description
-                             -------------------
-    begin                : Sun Jul 29 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cprofilemgr.h"
-
-//Qt includes
-#include <qdir.h>
-#include <qfile.h>
-#include <qptrlist.h>
-
-//KDE includes
-#include <kstandarddirs.h>
-
-CProfileMgr::CProfileMgr() : m_startupProfile(0) {
-	m_profiles.setAutoDelete(true);
-	
-	KStandardDirs stdDirs;
-	m_profilePath = stdDirs.saveLocation("data", "bibletime/sessions/");	
-	
-	QDir d( m_profilePath );
-	QStringList files = d.entryList("*.xml");
-	for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-		if ((*it) != "_startup_.xml")
-			m_profiles.append(new CProfile(m_profilePath + *it));
-		else
-			m_startupProfile = new CProfile(m_profilePath + *it);
-	}
-}
-
-CProfileMgr::~CProfileMgr(){
-	m_profiles.clear();//autoDelete is enabled, so all profiles are deleted
-}
-
-/** Returns a list of available profiles. */
-const QPtrList<CProfile>& CProfileMgr::profiles(){	
-	return m_profiles;
-}
-
-/** Creates a new profile with the name "name" (first parameter).  @return The profile object */
-CProfile* CProfileMgr::create( const QString name ){
-	CProfile* p = new CProfile(QString::null, name);
-	m_profiles.append(p);
-	
-	return p;	
-}
-
-/** Removes the profile from the list and from the directory containg the profile files. */
-const bool CProfileMgr::remove( CProfile* p ){
-	bool ret = false;
-	QFile f( p->filename() );
-	if (f.exists())
-		f.remove();		
-	if(m_profiles.remove(p)); //auto delete is enabled
-		ret = true;
-	return ret;
-}
-
-const bool CProfileMgr::remove( const QString& profile) {
-	bool ret = false;
-	for (CProfile* p = m_profiles.first(); p; p = m_profiles.next()) {
-		if (p->name() == profile) {
-			remove(p);
-			ret =  true;
-		}
-	}
-	return ret;
-}
-
-/** Returns the profile with the desired name. If there's no such profile 0 is returned. */
-CProfile* CProfileMgr::profile(const QString& name) {
-	for (m_profiles.first(); m_profiles.current(); m_profiles.next()) {
-		if (m_profiles.current()->name() == name) {
-			return m_profiles.current();	
-		}
-	}
-	return 0;
-}
-
-/** Returns the startup profile if it exists, otherwise return 0. */
-CProfile* CProfileMgr::startupProfile(){
-	if (!m_startupProfile)
-		m_startupProfile = new CProfile(QString::null, "_startup_");
-	return m_startupProfile;	
-}
-
-/** Refreshes the profiles available on disk. Use this function to update the list of profiles after another instance of CProfileMgr created a new profile. */
-void CProfileMgr::refresh(){
-	m_profiles.clear(); //delete all profiles
-	QDir d( m_profilePath );
-	QStringList files = d.entryList("*.xml");
-	for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-		CProfile p(m_profilePath + *it);
-		if (p.name() == "_startup_") { //new startup profile
-			if  (!m_startupProfile) //don't put this in the if clause above,it doesn't work!
-				m_startupProfile = new CProfile(m_profilePath + *it);
-		}
-		else if (!profile(p.name())) { //don't have it already
-			m_profiles.append(new CProfile(m_profilePath + *it));
-		}
-	}
-}
diff --git a/bibletime/frontend/cprofilemgr.h b/bibletime/frontend/cprofilemgr.h
deleted file mode 100644
index d26e6d2..0000000
--- a/bibletime/frontend/cprofilemgr.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/***************************************************************************
-                          cprofilemgr.h  -  description
-                             -------------------
-    begin                : Sun Jul 29 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPROFILEMGR_H
-#define CPROFILEMGR_H
-
-#include "cprofile.h"
-
-//Qt includes
-#include <qstring.h>
-
-/** The manager for profiles.
-	* Provides functions to create, delete, save and load profiles.
-  * @author The BibleTime team
-  */
-
-class CProfileMgr {
-public: 
-	CProfileMgr();
-	~CProfileMgr();	
-
-  /** Creates a new profile with the name "name" (first parameter).
-	* @return The profile object
-	*/
-  CProfile* create( const QString name );
-  /**
-  * @return a list of available profiles
-  */
-  const QPtrList<CProfile>& profiles();
-  /**
-  * Removes the profile from the list and from the directory containg the profile files.
-  */
-  const bool remove( CProfile* p );
-  /**
-  * Removes the profile from the list and from the directory containg the profile files.
-  */
-  const bool remove( const QString& );
-  /**
-  * Returns the profile with the desired name. If there's no such profile 0 is returned.
-  */
-  CProfile* profile(const QString&);
-  /**
-  * Returns the startup profile if it exists, otherwise return 0.
-  */
-  CProfile* startupProfile();
-  /**
-  * Refreshes the profiles available on disk. Use this function to update the list of profiles after another instance of CProfileMgr created a new profile.
-  */
-  void refresh();
-
-protected:	
-	QPtrList<CProfile> m_profiles;	
-	QString m_profilePath;
-	CProfile* m_startupProfile;
-};
-
-#endif
diff --git a/bibletime/frontend/cprofilewindow.cpp b/bibletime/frontend/cprofilewindow.cpp
deleted file mode 100644
index 63201b8..0000000
--- a/bibletime/frontend/cprofilewindow.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-/***************************************************************************
-                          cprofilewindow.cpp  -  description
-                             -------------------
-    begin                : Sun Jul 29 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cprofilewindow.h"
-
-CProfileWindow::CProfileWindow(CSwordModuleInfo::ModuleType type)
-	: m_type(type),
-    m_windowGeometry(),
-    m_moduleList(),
-    m_key(QString::null),
-	  m_maximized(false),
-	  m_hasFocus(false),
-    m_windowSettings(0),
-    m_writeWindowType(0)
-{
-  m_scrollbarPos.horizontal = 0;
-  m_scrollbarPos.vertical = 0;
-}
-
-CProfileWindow::~CProfileWindow(){
-
-}
-
-/** Returns the size of the window including the x,y coordinates. */
-const QRect& CProfileWindow::geometry() const {
-	return m_windowGeometry;
-}
-
-/** Sets the size of the window. */
-void CProfileWindow::setGeometry( const QRect& rect ){
-	m_windowGeometry = rect;
-}
-
-/** Returns the type of the managed window (bible window, commentary window or lexicon window). */
-const CSwordModuleInfo::ModuleType CProfileWindow::type() const {
-	if (m_type != CSwordModuleInfo::Unknown)
-		return m_type;
-  return CSwordModuleInfo::Unknown;
-}
-
-/** Sets the modules. */
-void CProfileWindow::setModules( const QStringList& modules ){
-	m_moduleList = modules; //copy module pointers into our own list
-}
-
-/** Returns a list of module names which are chosen in the managed window profile. */
-const QStringList& CProfileWindow::modules() const {
-	return m_moduleList;
-}
-
-/** Returns the current key set in the modules. */
-const QString& CProfileWindow::key() const {
-	return m_key;
-}
-
-/** Set the key used in the modules. */
-void CProfileWindow::setKey( const QString& key ){
-	m_key = key;
-}
-
-/** Sets the current position of the scrollbars. */
-void CProfileWindow::setScrollbarPositions(const int& horizontal, const int& vertical) {
-//	m_scrollbarPos = {x,y};
-	m_scrollbarPos.horizontal = horizontal;
-	m_scrollbarPos.vertical = vertical;
-}
-
-/** Returns tghe position of the scrollbars */
-const CProfileWindow::ScrollbarPos& CProfileWindow::scrollbarPositions() const {
-	return m_scrollbarPos;
-}
-
-/** Sets the type of the used modules. */
-void CProfileWindow::setType(const CSwordModuleInfo::ModuleType& type){
-	m_type = type;
-}
-
-/** Returns true if the window is maximized. */
-const bool& CProfileWindow::maximized() const {
-	return m_maximized;
-}
-
-/** Sets the windows maximized state to true or false. */
-void CProfileWindow::setMaximized( const bool& maximized ){
-	m_maximized = maximized;
-}
-
-/** Returns true if the window is maximized. */
-const bool& CProfileWindow::hasFocus() const {
-	return m_hasFocus;
-}
-
-/** Sets the windows maximized state to true or false. */
-void CProfileWindow::setFocus( const bool& hasFocus ){
-	m_hasFocus = hasFocus;
-}
-
-/** Returns an integer with the window specific settings */
-const int& CProfileWindow::windowSettings() const {
-	return m_windowSettings;
-}
-
-/** Sets the window specific settings. */
-void CProfileWindow::setWindowSettings( const int& settings ){
-	m_windowSettings = settings;
-}
-
-/** Tells this profile window to represent a write window. */
-void CProfileWindow::setWriteWindowType( const int& writeWindowType ){
-  m_writeWindowType = writeWindowType;
-}
-
-/** Returns whether this profile window represents a write window. */
-const int& CProfileWindow::writeWindowType() const {
-  return m_writeWindowType;
-}
diff --git a/bibletime/frontend/cprofilewindow.h b/bibletime/frontend/cprofilewindow.h
deleted file mode 100644
index 10286b8..0000000
--- a/bibletime/frontend/cprofilewindow.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/***************************************************************************
-                          cprofilewindow.h  -  description
-                             -------------------
-    begin                : Sun Jul 29 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPROFILEWINDOW_H
-#define CPROFILEWINDOW_H
-
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbackend.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qrect.h>
-#include <qstringlist.h>
-#include <qptrlist.h>
-
-/** Contains the settings for one window saved in the profile.
-  * @author The BibleTime team
-  */
-class CProfileWindow {
-public:
-  struct ScrollbarPos {
-		int horizontal; 	//the position of the horizontal scrollbar
-		int vertical;	//the position of the vertical scrollbar
-  };
-
-	CProfileWindow(CSwordModuleInfo::ModuleType type = CSwordModuleInfo::Unknown);
-	~CProfileWindow();
-  /**
-  * Sets the modules.
-  */
-  void setModules( const QStringList& modules );
-  /**
-  * Returns the type of the managed window (bible window, commentary window or lexicon window).
-  */
-  const CSwordModuleInfo::ModuleType type() const;
-  /**
-  * Sets the type of the used modules.
-  */
-  void setType(const CSwordModuleInfo::ModuleType& type);
-  /**
-  * Sets the size of the window.
-  */
-  void setGeometry( const QRect& s );
-  /**
-  * Returns the size of the window including the x,y coordinates.
-  */
-  const QRect& geometry() const;
-  /**
-  * Returns a list of module names which are chosen in the managed window profile.
-  */
-  const QStringList& modules() const;
-  /**
-  * Set the key used in the modules.
-  */
-  void setKey( const QString& );
-  /**
-  * Returns the current key set in the modules.
-  */
-  const QString& key() const;
-  /**
-  * Sets the current position of the scrollbars.
-  */
-  void setScrollbarPositions(const int& x, const int& y);
-  /**
-  * Sets the windows maximized state to true or false.
-  */
-  void setMaximized( const bool& maximized );
-  /**
-  * Sets the windows hasFocus state to true or false.
-  */
-  void setFocus( const bool& hasFocus );
-  /**
-  * Sets the window specific settings.
-  */
-  void setWindowSettings( const int& settings );
-  /**
-  * Returns an integer with the window specific settings
-  */
-  const int& windowSettings() const;
-  /**
-  * Returns true if the window is maximized.
-  */
-  const bool& maximized() const;
-  /**
-  * Returns true if the window has the focus in the MDI area.
-  */
-  const bool& hasFocus() const;
-  /**
-  * Returns tghe position of the scrollbars
-  */
-  const CProfileWindow::ScrollbarPos& scrollbarPositions() const;
-  /**
-  * Returns whether this profile window represents a write window.
-  */
-  const int& writeWindowType() const;
-  /**
-  * Tells this profile window to represent a write window.
-  */
-  void setWriteWindowType( const int& writeWindowType );
-
-private:
-	CSwordModuleInfo::ModuleType m_type;
-	QRect m_windowGeometry;
-	QStringList m_moduleList;
-	QString m_key;
-	ScrollbarPos m_scrollbarPos;
-	bool m_maximized;
-	bool m_hasFocus;
-	int m_windowSettings;
-  int m_writeWindowType;
-};
-
-#endif
-
diff --git a/bibletime/frontend/cswordsetupdialog.cpp b/bibletime/frontend/cswordsetupdialog.cpp
deleted file mode 100644
index a76a108..0000000
--- a/bibletime/frontend/cswordsetupdialog.cpp
+++ /dev/null
@@ -1,1402 +0,0 @@
-/***************************************************************************
-                          coptionsdialog.cpp  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cswordsetupdialog.h"
-
-#include "backend/cswordbackend.h"
-#include "backend/cswordmoduleinfo.h"
-
-#include "util/cresmgr.h"
-#include "util/ctoolclass.h"
-#include "util/scoped_resource.h"
-
-
-#include <iostream>
-//#include <stdlib.h>
-
-//QT includes
-#include <qdir.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qcombobox.h>
-#include <qwidgetstack.h>
-#include <qfileinfo.h>
-#include <qpushbutton.h>
-#include <qlineedit.h>
-#include <qdict.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <kconfig.h>
-#include <kdirselectdialog.h>
-#include <keditlistbox.h>
-#include <klocale.h>
-#include <kstandarddirs.h>
-#include <kiconloader.h>
-#include <kmessagebox.h>
-#include <kprogress.h>
-#include <kurl.h>
-
-//Sword includes
-#include <installmgr.h>
-#include <swmodule.h>
-#include <swversion.h>
-
-
-using std::cout;
-using std::cerr;
-using std::endl;
-
-using namespace sword;
-
-CInstallSourcesMgrDialog::InstallSourceItem::InstallSourceItem( KListView* parent ) :
-	KListViewItem(parent, QString::null)
-{
-
-}
-
-CInstallSourcesMgrDialog::InstallSourceItem::InstallSourceItem( KListView* parent, sword::InstallSource is ) : KListViewItem(parent, QString::null)
-{
-	setCaption( QString::fromLatin1(is.caption.c_str()) );
-	m_url.setHost( QString::fromLatin1(is.source.c_str()) );
-	m_url.setPath( QString::fromLatin1(is.directory.c_str()) );
-	setEnabled(true);
-
-	updateItem();
-}
-
-const QUrl& CInstallSourcesMgrDialog::InstallSourceItem::url() const {
-	return m_url;
-}
-
-void CInstallSourcesMgrDialog::InstallSourceItem::setURL(const QUrl& url) {
-	m_url = url;
-	updateItem();
-}
-
-const QString& CInstallSourcesMgrDialog::InstallSourceItem::caption() const {
-	return m_caption;
-}
-
-void CInstallSourcesMgrDialog::InstallSourceItem::setCaption( const QString& caption ) {
-	if (caption.isEmpty())
-		return;
-
-	m_caption = caption;
-	updateItem();
-}
-
-const QString CInstallSourcesMgrDialog::InstallSourceItem::server() const {
-	return m_url.host();
-}
-
-void CInstallSourcesMgrDialog::InstallSourceItem::setServer( const QString& server ) {
-	if (server.isEmpty())
-		return;
-
-	m_url.setHost(server);
-	updateItem();
-}
-
-const QString CInstallSourcesMgrDialog::InstallSourceItem::path() const {
-	return m_url.path();
-}
-
-void CInstallSourcesMgrDialog::InstallSourceItem::setPath( const QString& path ) {
-	if (path.isEmpty())
-		return;
-
-	m_url.setPath(path);
-	updateItem();
-}
-
-/*const bool CInstallSourcesMgrDialog::InstallSourceItem::isEnabled() const {
-	return isOn();
-}
-
-void CInstallSourcesMgrDialog::InstallSourceItem::setEnabled( const bool enabled ) {
-	setOn(enabled);
-	updateItem();
-}*/
-
-void CInstallSourcesMgrDialog::InstallSourceItem::updateItem() {
-	setText(0, m_caption);
-//	setText(1, m_url.host() + m_url.path());
-}
-
-sword::InstallSource CInstallSourcesMgrDialog::InstallSourceItem::swordInstallSource() {
-	sword::InstallSource src("FTP");
-	src.caption = m_caption.latin1();
-	src.source = m_url.host().latin1();
-	src.directory = m_url.path().latin1();
-
-	return src;
-}
-
-CInstallSourcesMgrDialog::CInstallSourcesMgrDialog(QWidget *parent, const char *name )
-	: KDialogBase(IconList, i18n("Manage installation sources"), Ok, Ok, parent, name, true, true, QString::null, QString::null, QString::null) {
-
-	initLocalSourcesPage();
-	initRemoteSourcesPage();
-}
-
-void CInstallSourcesMgrDialog::slotOk() {
-	//save local sources
-	BTInstallMgr::Tool::RemoteConfig::resetLocalSources(); //we want to overwrite old sources, not add to them
-	QListViewItemIterator it(m_localSourcesList);
-	while (it.current()) {
-		sword::InstallSource is = sword::InstallSource("DIR");
-		is.caption = it.current()->text(0).latin1();
-		is.source = "local"; //just some placeholder to make InstallSrc's parsing happy
-		is.directory = it.current()->text(0).latin1();
-		BTInstallMgr::Tool::RemoteConfig::addSource( &is );
-
-		++it; //next local source item
-	}
-
-
-	//save remote sources
-	BTInstallMgr::Tool::RemoteConfig::resetRemoteSources(); //we wan't to overwrite old sources, not add to them
-	it = QListViewItemIterator(m_remoteSourcesList);
-	while (it.current()) {
-		InstallSourceItem* item = dynamic_cast<InstallSourceItem*>(it.current());
-		if (!item)
-			continue;
-
-		sword::InstallSource is = item->swordInstallSource();
-		BTInstallMgr::Tool::RemoteConfig::addSource( &is );
-		++it; //next checked item
-	}
-
-	KDialogBase::slotOk();
-}
-
-void CInstallSourcesMgrDialog::initLocalSourcesPage() {
-	m_localSourcesPage = addPage(i18n("Local sources"), QString::null, DesktopIcon("folder",32));
- 	m_localSourcesPage->setMinimumSize(500,400);
-
-	QGridLayout* grid = new QGridLayout(m_localSourcesPage, 4,3, 5,5);
-
-	QLabel* mainLabel = CToolClass::explanationLabel(m_localSourcesPage,
-		i18n("Manage local sources"),
-		i18n("Here you can setup the local sources for module installation, e.g. the path to your CD-Rom to install from a Sword CD.<br>On many Linux distributions the path to your cdrom is either <i>/media/cdrom</i> or <i>/cdrom</i> Please make sure you mounted the CD-Rom before you use BibleTime to install from CD-Rom.")
-  );
-	grid->addMultiCellWidget(mainLabel, 0, 0, 0, 2);
-
-	m_localSourcesList = new KListView( m_localSourcesPage );
-	m_localSourcesList->addColumn(i18n("Local sources"));
-	m_localSourcesList->setFullWidth(true);
-
-	QPushButton* addButton = new QPushButton(i18n("Add new directory"), m_localSourcesPage);
-	connect(addButton, SIGNAL(clicked()), SLOT(slot_localAddSource()));
-
-	QPushButton* removeButton = new QPushButton(i18n("Remove directory"), m_localSourcesPage);
-	connect(removeButton, SIGNAL(clicked()), SLOT(slot_localRemoveSource()));
-
-	grid->addMultiCellWidget( m_localSourcesList, 1,3, 0,1 );
-	grid->setColStretch(0, 5);
-	grid->setColStretch(1, 5);
-
-	grid->setRowStretch(0, 0);
-	grid->setRowStretch(3, 5);
-
-	grid->addWidget( addButton, 1,2 );
-	grid->addWidget( removeButton, 2,2 );
-	grid->setColStretch(2, 0);
-
-
-	//noe insert existing local source items, if there are no sources setup with default source
-	BTInstallMgr mgr;
-	QStringList sources = BTInstallMgr::Tool::RemoteConfig::sourceList( &mgr );
-	for (QStringList::iterator it = sources.begin(); it != sources.end(); ++it) {
-		sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, (*it).latin1());
-		if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource( &is )) { //only use local sources as items
-			continue;
-		}
-
-		/*QListViewItem* i = */new KListViewItem( m_localSourcesList, *it );
-		//i->setText(0, *it);
-	}
-
-	if (m_localSourcesList->childCount() == 0) {
-//		InstallSourceItem* i = new InstallSourceItem(m_remoteSourcesList);
-//		i->setCaption("Crosswire");
-//		i->setURL(QUrl("ftp://ftp.crosswire.org/pub/sword/raw/"));
-	}
-
-}
-
-void CInstallSourcesMgrDialog::slot_localAddSource() {
-	//Add a new dir to the list.
-  KURL url = KDirSelectDialog::selectDirectory(QString::null, true);
-  if (url.isValid()) {
-		new KListViewItem(m_localSourcesList, url.path());
-  }
-}
-
-void CInstallSourcesMgrDialog::slot_localRemoveSource() {
-	if (m_localSourcesList->currentItem()) {
-		delete m_localSourcesList->currentItem();
-	}
-}
-
-void CInstallSourcesMgrDialog::initRemoteSourcesPage() {
-	m_remoteSourcesPage = addPage(i18n("Remote sources"), QString::null, DesktopIcon("network",32));
- 	m_remoteSourcesPage->setMinimumSize(500,400);
-
-	QGridLayout* grid = new QGridLayout(m_remoteSourcesPage, 5,5, 5,5);
-
-	QLabel* mainLabel = CToolClass::explanationLabel(m_remoteSourcesPage,
-		i18n("Manage remote sources"),
-		i18n("Setup remote sources like FTP servers which can be used to download Sword modules on your computer.")
-  );
-	grid->addMultiCellWidget(mainLabel, 0, 0, 0, 4);
-
-	m_remoteSourcesList = new KListView( m_remoteSourcesPage );
-	m_remoteSourcesList->setAllColumnsShowFocus(true);
-	m_remoteSourcesList->addColumn(i18n("Name"));
-//  m_remoteSourcesList->addColumn("URL");
-	m_remoteSourcesList->setFullWidth(true);
-	connect(m_remoteSourcesList, SIGNAL(selectionChanged()),
-		SLOT(slot_remoteSourceSelectionChanged()));
-
- 	QPushButton* addButton = new QPushButton(i18n("New"), m_remoteSourcesPage);
-	addButton->setIconSet(DesktopIcon("filenew", 16));
-	connect(addButton, SIGNAL(clicked()), SLOT(slot_remoteAddSource()));
-
-	QPushButton* removeButton = new QPushButton(i18n("Remove"), m_remoteSourcesPage);
-	removeButton->setIconSet(DesktopIcon("edittrash", 16));
-	connect(removeButton, SIGNAL(clicked()), SLOT(slot_remoteRemoveSource()));
-
-	grid->addMultiCellWidget( m_remoteSourcesList, 1,3, 0,2 );
-	grid->setRowStretch(0, 0);
-	grid->setRowStretch(1, 5);
-	grid->addWidget( addButton, 4,0 );
-	grid->addWidget( removeButton, 4,1 );
-
-	grid->setColStretch(0, 0);
-	grid->setColStretch(1, 0);
-	grid->setColStretch(2, 0);
-	grid->setColStretch(3, 5);
-
-	//contains the remote sources edit controls, we need boxes for the caption, the server, the dir on the server
-	QGroupBox* box = new QGroupBox(m_remoteSourcesPage);
-	box->setTitle(i18n("Edit remote source"));
-	grid->addMultiCellWidget( box, 1,4, 3,4 );
-
-	QGridLayout* boxGrid = new QGridLayout(box, 4, 3, box->insideMargin() + box->insideSpacing(), 5);
-	boxGrid->setColStretch(1, 5);
-
-	boxGrid->addWidget(new QLabel(i18n("Name:"), box), 0,0);
-
-	m_remoteCaptionEdit = new QLineEdit(box);
-	connect(m_remoteCaptionEdit, SIGNAL(textChanged(const QString&)),
-		SLOT(slot_remoteCaptionChanged(const QString&)));
-	boxGrid->addWidget(m_remoteCaptionEdit, 0,1);
-
-
-	m_remoteServerEdit = new QLineEdit(box);;
-	connect(m_remoteServerEdit, SIGNAL(textChanged(const QString&)),
-		SLOT(slot_remoteServerChanged(const QString&)));
-	boxGrid->addWidget(new QLabel(i18n("Server:"), box), 1,0);
-	boxGrid->addWidget(m_remoteServerEdit, 1,1);
-
-	m_remotePathEdit = new QLineEdit(box);;
-	connect(m_remotePathEdit, SIGNAL(textChanged(const QString&)),
-		SLOT(slot_remotePathChanged(const QString&)));
-	boxGrid->addWidget(new QLabel(i18n("Path on server:"), box), 2,0);
-	boxGrid->addWidget(m_remotePathEdit, 2,1);
-
-
-	//now setup some reasonable default server entries
-
-	//noe insert existing remote source items, if there are no sources setup with default source
-	BTInstallMgr mgr;
-	QStringList sources = BTInstallMgr::Tool::RemoteConfig::sourceList( &mgr );
-	for (QStringList::iterator it = sources.begin(); it != sources.end(); ++it) {
-		sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, (*it).latin1());
-		if (!BTInstallMgr::Tool::RemoteConfig::isRemoteSource( &is )) { //only use remote sources as items
-			continue;
-		}
-
-		(void)new InstallSourceItem( m_remoteSourcesList, is );
-	}
-
-	if (m_remoteSourcesList->childCount() == 0) { //setup with the default if no items were present
-		InstallSourceItem* i = new InstallSourceItem(m_remoteSourcesList);
-		i->setCaption("Crosswire");
-		i->setURL(QUrl("ftp://ftp.crosswire.org/pub/sword/raw"));
-	}
-
-	//now select the first item in the list
-	m_remoteSourcesList->setSelected(m_remoteSourcesList->firstChild(), true);
-	m_remoteSourcesList->setCurrentItem( m_remoteSourcesList->firstChild() );
-	slot_remoteSourceSelectionChanged();
-	m_remoteCaptionEdit->setFocus();
-}
-
-void CInstallSourcesMgrDialog::slot_remoteAddSource() {
-	CInstallSourcesMgrDialog::InstallSourceItem* i = new CInstallSourcesMgrDialog::InstallSourceItem(m_remoteSourcesList);
-
-	m_remoteSourcesList->setCurrentItem( i );
-	m_remoteCaptionEdit->setText(i18n("New remote source"));
-	m_remoteServerEdit->setText("ftp.domain.org");
-	m_remotePathEdit->setText("/pub/sword/raw");
-	m_remoteCaptionEdit->setFocus();
-}
-
-void CInstallSourcesMgrDialog::slot_remoteChangeSource() {
-}
-
-void CInstallSourcesMgrDialog::slot_remoteRemoveSource() {
-	delete m_remoteSourcesList->currentItem();
-}
-
-void CInstallSourcesMgrDialog::slot_remoteSourceSelectionChanged() {
-	//Apply settings of new source to the edit widgets
-	InstallSourceItem* i = dynamic_cast<InstallSourceItem*>(m_remoteSourcesList->currentItem());
-	if (!i)
-		return;
-
-	m_remoteCaptionEdit->setText( i->caption() );
-	m_remoteServerEdit->setText( i->server() );
-	m_remotePathEdit->setText( i->path() );
-}
-
-void CInstallSourcesMgrDialog::slot_remoteCaptionChanged( const QString& t) {
-	InstallSourceItem* i = dynamic_cast<InstallSourceItem*>(m_remoteSourcesList->currentItem());
-	if (!i)
-		return;
-
-	i->setCaption(t);
-}
-
-void CInstallSourcesMgrDialog::slot_remoteServerChanged( const QString& t ) {
-	InstallSourceItem* i = dynamic_cast<InstallSourceItem*>(m_remoteSourcesList->currentItem());
-	if (!i)
-		return;
-
-	i->setServer(t);
-}
-
-void CInstallSourcesMgrDialog::slot_remotePathChanged( const QString& t) {
-	InstallSourceItem* i = dynamic_cast<InstallSourceItem*>(m_remoteSourcesList->currentItem());
-	if (!i)
-		return;
-
-	i->setPath(t);
-}
-
-/*******************************/
-/* 									New class												*/
-/******************************/
-
-
-CSwordSetupDialog::CSwordSetupDialog(QWidget *parent, const char *name )
-	: KDialogBase(IconList, i18n("Sword configuration"), Ok, Ok, parent, name, true, true, QString::null, QString::null, QString::null),
-		m_removeModuleListView(0),
-		m_installModuleListPage(0),
-		m_installModuleListView(0),
-		m_progressDialog(0),
-  	m_refreshedRemoteSources(false)
-{
-	setIconListAllVisible(true);
-
-  initSwordConfig();
-	initInstall();
-	initRemove();
-}
-
-
-void CSwordSetupDialog::initSwordConfig(){
-	QFrame* page = m_swordConfigPage = addPage(i18n("Sword Path"), QString::null, DesktopIcon("bt_swordconfig",32));
- 	page->setMinimumSize(500,400);
-
-	QGridLayout* layout = new QGridLayout(page, 6, 4);
-	layout->setMargin(5);
-
-	layout->setSpacing(10);
-	layout->setColStretch(0,1);
-	layout->setRowStretch(5,1);
-
-	QLabel* mainLabel = CToolClass::explanationLabel(page,
-		i18n("Configure Sword"),
-		i18n("The underlying Sword software uses an own configuration file. This page let you set up this file.")
-  );
-	layout->addMultiCellWidget(mainLabel, 0, 0, 0, 3);
-
-
-  QString swordConfPath = BTInstallMgr::Tool::LocalConfig::swordConfigFilename();
-	QLabel* confPathLabel = new QLabel(i18n("Your Sword configuration file is <b>%1</b>").arg(swordConfPath), page);
-	layout->addMultiCellWidget(confPathLabel, 1,1,0,3);
-
-  m_swordPathListBox = new KListView(page);
-  m_swordPathListBox->setFullWidth(true);
-  m_swordPathListBox->addColumn(i18n("Path to Sword modules"));
-  connect(m_swordPathListBox, SIGNAL(selectionChanged()), this, SLOT(slot_swordPathSelected()));
-  layout->addMultiCellWidget(m_swordPathListBox, 2,5,0,1);
-
-  m_swordEditPathButton = new QPushButton(i18n("Edit Entry"), page);
-  m_swordEditPathButton->setIconSet(DesktopIcon("edit", 16));
-  connect(m_swordEditPathButton, SIGNAL(clicked()), this, SLOT(slot_swordEditClicked()));
-  layout->addWidget(m_swordEditPathButton, 2, 3);
-
-  m_swordAddPathButton = new QPushButton(i18n("Add Entry"), page);
-  m_swordAddPathButton->setIconSet(DesktopIcon("edit_add", 16));
-  connect(m_swordAddPathButton, SIGNAL(clicked()), this, SLOT(slot_swordAddClicked()));
-  layout->addWidget(m_swordAddPathButton, 3,3);
-
-  m_swordRemovePathButton = new QPushButton(i18n("Remove Entry"), page);
-  m_swordRemovePathButton->setIconSet(DesktopIcon("editdelete", 16));
-  connect(m_swordRemovePathButton, SIGNAL(clicked()), this, SLOT(slot_swordRemoveClicked()));
-  layout->addWidget(m_swordRemovePathButton, 4,3);
-
-  setupSwordPathListBox();
-}
-
-void CSwordSetupDialog::initInstall(){
-	m_installPage = addPage(i18n("Install/Update Modules"), QString::null, DesktopIcon("bt_bible",32));
-
-	QVBoxLayout* vboxlayout = new QVBoxLayout(m_installPage);
-	QHBoxLayout* hboxlayout = new QHBoxLayout();
-  hboxlayout->setAutoAdd( true );
-
-  vboxlayout->addLayout(hboxlayout);
-
-	m_installWidgetStack = new QWidgetStack(m_installPage);
-  hboxlayout->addWidget(m_installWidgetStack);
-
-	m_installSourcePage = new QWidget(0);
-  m_installWidgetStack->addWidget(m_installSourcePage);
-
-	m_installSourcePage->setMinimumSize(500,400);
-
-	QGridLayout* layout = new QGridLayout(m_installSourcePage, 7, 2);
-	layout->setMargin(5);
-	layout->setSpacing(10);
-	layout->setRowStretch(6,5);
-
-	QLabel* installLabel = CToolClass::explanationLabel(m_installSourcePage,
-		i18n("Install/update modules - Step 1"),
-		i18n("Please choose a source and a destination. After that step click on the connect button.<br/><b>WARNING: If you live in a persecuted country and do not wish to risk detection you should NOT use the module remote installation feature!</b>")
-  );
-	layout->addMultiCellWidget(installLabel, 0,0,0,1);
-
-	QLabel* sourceHeadingLabel = new QLabel(QString::fromLatin1("<b>%1</b>").arg(i18n("Select source location")), m_installSourcePage);
-	layout->addMultiCellWidget(sourceHeadingLabel, 1,1,0,1);
-
-	m_sourceCombo = new QComboBox(m_installSourcePage);
-	layout->addWidget(m_sourceCombo, 2, 0);
-
-	QPushButton* maintainSourcesButton = new QPushButton(i18n("Maintain sources"), m_installSourcePage);
-	maintainSourcesButton->setIconSet(DesktopIcon("edit", 16));
-	connect(maintainSourcesButton, SIGNAL(clicked()), SLOT(slot_installManageSources()));
-	layout->addWidget(maintainSourcesButton, 2, 1, Qt::AlignLeft);
-
-	m_sourceLabel = new QLabel(m_installSourcePage);
-	layout->addMultiCellWidget(m_sourceLabel, 3,3,0,1);
-
-	QLabel* targetHeadingLabel = new QLabel(QString::fromLatin1("<b>%1</b>").arg(i18n("Select target location")), m_installSourcePage);
-	layout->addMultiCellWidget(targetHeadingLabel, 4,4,0,1);
-
-	m_targetCombo = new QComboBox(m_installSourcePage);
-	layout->addWidget(m_targetCombo, 5, 0);
-
-	m_targetLabel = new QLabel(m_installSourcePage);
-	layout->addMultiCellWidget(m_targetLabel, 6,6,0,1,Qt::AlignTop);
-
-//part beloew main layout with the back/next buttons
-	QHBoxLayout* myHBox = new QHBoxLayout();
-  vboxlayout->addLayout(myHBox);
-
-  m_installBackButton = new QPushButton(i18n("Back"), m_installPage);
-	m_installBackButton->setIconSet(DesktopIcon("back",16));
-	myHBox->addWidget(m_installBackButton);
-
-	myHBox->addSpacing(10);
-	myHBox->addStretch(5);
-
-  m_installContinueButton = new QPushButton(i18n("Connect to source"), m_installPage);
-	m_installContinueButton->setIconSet(DesktopIcon("forward",16));
-  connect(m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_connectToSource()));
-	myHBox->addWidget(m_installContinueButton);
-
-  m_installBackButton->setEnabled(false);
-
-	connect(m_sourceCombo, SIGNAL( highlighted(const QString&) ), SLOT( slot_sourceSelected( const QString&) ));
-	connect(m_targetCombo, SIGNAL( highlighted(const QString&) ), SLOT( slot_targetSelected( const QString&) ));
-	populateInstallCombos();
-
-  slot_sourceSelected( m_sourceCombo->currentText() );
-}
-
-void CSwordSetupDialog::initRemove(){
-	QFrame* page = m_removePage = addPage(i18n("Remove Modules"), QString::null, DesktopIcon("edittrash",32));
-
-	page->setMinimumSize(500,400);
-
-	QGridLayout* layout = new QGridLayout(page, 4, 4);
-	layout->setMargin(5);
-
-	layout->setSpacing(10);
-	layout->setColStretch(1,1);
-	layout->setRowStretch(2,1);
-
-	QLabel* mainLabel= CToolClass::explanationLabel(page,
-		i18n("Remove installed module(s)"),
-		i18n("This dialog lets you remove installed Sword modules from your system. Choose the modules and then click on the remove button.")
-  );
-	layout->addMultiCellWidget(mainLabel, 0, 0, 0, 3);
-
-	QLabel* headingLabel = new QLabel(QString::fromLatin1("<b>%1</b>").arg(i18n("Select modules to be uninstalled")), page);
-	layout->addMultiCellWidget(headingLabel, 1, 1, 0, 3);
-
-	m_populateListNotification = new QLabel("", page);
-	layout->addWidget(m_populateListNotification, 3, 2, Qt::AlignCenter);
-
-	m_removeModuleListView = new KListView(page, "remove modules view");
-	layout->addMultiCellWidget( m_removeModuleListView, 2,2,0,3);
-	m_removeModuleListView->addColumn(i18n("Name"));
-  m_removeModuleListView->addColumn(i18n("Location"));
- 	m_removeModuleListView->setAllColumnsShowFocus(true);
- 	m_removeModuleListView->setFullWidth(true);
-	m_removeModuleListView->setRootIsDecorated(true);
-	connect(m_removeModuleListView, SIGNAL(pressed(QListViewItem*)),
-		SLOT(slot_removeModuleItemExecuted(QListViewItem*)));
-	connect(m_removeModuleListView, SIGNAL(spacePressed(QListViewItem*)),
-		SLOT(slot_removeModuleItemExecuted(QListViewItem*)));
-
-  m_removeRemoveButton = new QPushButton(i18n("Remove selected module(s)"), page);
-	m_removeRemoveButton->setIconSet( DesktopIcon("edittrash", 16) );
-	layout->addWidget(m_removeRemoveButton, 3, 3, Qt::AlignRight);
-
-	connect(m_removeRemoveButton, SIGNAL(clicked()),
-		this, SLOT(slot_doRemoveModules()));
-
-	populateRemoveModuleListView();
-}
-
-/** Called if the OK button was clicked */
-void CSwordSetupDialog::slotOk(){
-  //save the Sword path configuration here
-  if (m_swordPathListBox->childCount()) {
-    QStringList targets;
-
-    QListViewItemIterator it( m_swordPathListBox );
-    while ( it.current() ) {
-      QListViewItem *item = it.current();
-      if (!item->text(0).isEmpty()) {
-        targets << item->text(0);
-      }
-      ++it;
-    }
-
-    BTInstallMgr::Tool::LocalConfig::setTargetList(targets); //creates new Sword config
-  }
-
-  KDialogBase::slotOk();
-  emit signalSwordSetupChanged( );
-}
-
-/*called if the apply button was clicked*/
-void CSwordSetupDialog::slotApply(){
-	KDialogBase::slotApply();
-  emit signalSwordSetupChanged();
-}
-
-/** Opens the page which contaisn the given part ID. */
-const bool CSwordSetupDialog::showPart( CSwordSetupDialog::Parts ID, const bool /*exclusive*/ ) {
-//  if (exlusive) {
-//    m_swordConfigPage->setEnabled(false);
-//    m_installPage->setEnabled(false)
-//    m_removePage->setEnabled(false)
-//  }
-
-  bool ret = false;
-	switch (ID) {
-		case CSwordSetupDialog::Sword:
-      showPage( pageIndex(m_swordConfigPage) );
-			break;
-		case CSwordSetupDialog::Install:
-      showPage( pageIndex(m_installPage) );
-			break;
-		case CSwordSetupDialog::Remove:
-      showPage( pageIndex(m_removePage) );
-			break;
-		default:
-			break;
-	}
-  return ret;
-}
-
-/** No descriptions */
-void CSwordSetupDialog::populateInstallCombos(){
-	m_sourceCombo->clear();
-
-	BTInstallMgr::Tool::RemoteConfig::initConfig();
-
-  QStringList list;
-	{
-		BTInstallMgr mgr;
-		list = BTInstallMgr::Tool::RemoteConfig::sourceList(&mgr);
-	}
-	if (!list.count()) { //add Crosswire entry
-		InstallSource is("FTP");   //default return value
-		is.caption = "Crosswire";
-		is.source = "ftp.crosswire.org";
-		is.directory = "/pub/sword/raw";
-		BTInstallMgr::Tool::RemoteConfig::addSource(&is);
-
-		BTInstallMgr mgr; //make sure we're uptodate
-		list = BTInstallMgr::Tool::RemoteConfig::sourceList(&mgr);
-
-		Q_ASSERT( list.count() > 0 );
-	}
-
-  BTInstallMgr mgr;
-  for (QStringList::iterator it = list.begin(); it != list.end(); ++it) {
-		sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, *it);
-		if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) { //remote source?
-    	m_sourceCombo->insertItem( i18n("[Remote]") + " " + *it );
-		}
-		else {
-			QFileInfo fi(*it);
-			if (fi.isDir() && fi.isReadable()) {
-				m_sourceCombo->insertItem( i18n("[Local]") + " " + *it );
-			}
-		}
-  }
-
-	//Fill in the targets in the targets combobox
-  //list = (m_targetCombo->count()) ? m_swordPathListBox : BTInstallMgr::Tool::LocalConfig::targetList();
-	if (m_targetCombo->count()) { //we already read in the list once, we have to use the Sword paths list items now because this list is newer
-		list.clear();
-		QListViewItemIterator it2( m_swordPathListBox );
-		while (it2.current()) {
-			list << it2.current()->text(0);
-
-			++it2;
-		}
-	}
-	else {
-		list = BTInstallMgr::Tool::LocalConfig::targetList();
-	}
-
-	m_targetCombo->clear();
-  for (QStringList::iterator it = list.begin(); it != list.end(); ++it) {
-		QFileInfo fi(*it);
-		if (fi.isDir() && fi.isWritable()) {
-			m_targetCombo->insertItem( *it );
-		}
-  }
-
-//init widget states
-m_targetCombo->setEnabled( (m_targetCombo->count() > 0) );
-m_installContinueButton->setEnabled(
-	(m_sourceCombo->count() > 0) && (m_targetCombo->count() > 0)
-);
-
-	slot_sourceSelected( m_sourceCombo->currentText() );
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_sourceSelected(const QString &sourceName){
-	//remove status parta
-	QString source = sourceName;
-	//we have to be a bit compilcated here because Qt 3.0.5 doesn't have the QString::replace(QString s) function
-
-	//source = source.remove( i18n("[Local]") + " " );
-	QString rep = i18n("[Local]") + " ";
-	int i = source.find(rep);
-	if (i>=0)
-		source.remove(i, rep.length());
-
-	//source = source.remove( i18n("[Remote]") + " " );
-	rep = i18n("[Remote]") + " ";
-	i = source.find(rep);
-	if (i>=0)
-		source.remove(i, rep.length());
-
-
-  BTInstallMgr mgr;
-	// qWarning("%s schosen", source.latin1());
-
-  QString url;
-  sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&mgr, source) ;
-
-  if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) {
-    url = QString::fromLatin1("ftp://%1%2").arg(is.source.c_str()).arg(is.directory.c_str());
-  }
-  else {
-    url = QString::fromLatin1("%1").arg(is.directory.c_str());
-  }
-  m_sourceLabel->setText( url );
-
-  m_refreshedRemoteSources = false;
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_targetSelected(const QString &targetName){
-	m_targetLabel->setText( m_targetMap[targetName] );
-  target = m_targetMap[targetName];
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_doRemoveModules(){
-	QStringList moduleList;
-
-	QListViewItemIterator list_it( m_removeModuleListView );
-	while ( list_it.current() ) {
-		QCheckListItem* i = dynamic_cast<QCheckListItem*>( list_it.current() );
-		if (i && i->isOn()) {
-			moduleList << list_it.current()->text(0);
-		}
-
-		++list_it;
-	}
-
-	const QString message = i18n("You selected the following modules: %1.\n\n"
-		"Do you really want to remove them from your system?").arg(moduleList.join(", "));
-
-	if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)){  //Yes was pressed.
-    sword::InstallMgr installMgr;
-		QDict<sword::SWMgr> mgrDict; //maps config paths to SWMgr objects
-
-  	for ( QStringList::Iterator it = moduleList.begin(); it != moduleList.end(); ++it ) {
-      if (CSwordModuleInfo* m = backend()->findModuleByName(*it)) { //module found?
-        QString prefixPath = m->config(CSwordModuleInfo::AbsoluteDataPath) + "/";
-        QString dataPath = m->config(CSwordModuleInfo::DataPath);
-
-        if (dataPath.left(2) == "./") {
-          dataPath = dataPath.mid(2);
-        }
-
-				if (prefixPath.contains(dataPath)) { //remove module part to get the prefix path
-          prefixPath = prefixPath.remove( prefixPath.find(dataPath), dataPath.length() );
-        }
-        else { //fall back to default Sword config path
-          prefixPath = QString::fromLatin1(backend()->prefixPath);
-        }
-
-				sword::SWMgr* mgr = mgrDict[ prefixPath ];
-				if (!mgr) { //create new mgr if it's not yet available
-					mgrDict.insert(prefixPath, new sword::SWMgr(prefixPath.local8Bit()));
-					mgr = mgrDict[ prefixPath ];
-				}
-
-        installMgr.removeModule(mgr, m->name().latin1());
-      }
-    }
-
-		CPointers::backend()->reloadModules();
-    populateRemoveModuleListView(); //rebuild the tree
-    populateInstallModuleListView( currentInstallSource() ); //rebuild the tree
-
-		//delete all mgrs
-		mgrDict.setAutoDelete(true);
-		mgrDict.clear();
-  }
-}
-
-void CSwordSetupDialog::slot_removeModuleItemExecuted(QListViewItem* item) {
-	// This function enabled the Install modules button if modules are chosen
-	// If an item was clicked to be not chosen look if there are other selected items
-	// If the item was clicked to be chosen enable the button without looking at the other items
-
-	QCheckListItem* checkItem = dynamic_cast<QCheckListItem*>(item);
-	if (item && !checkItem) //no valid item for us
-		return;
-
-	if (checkItem && checkItem->isOn()) {
-		m_removeRemoveButton->setEnabled(true);
-	}
-	else {
-		QListViewItemIterator it( m_removeModuleListView );
-		QCheckListItem* ci = 0;
-		while (it.current()) {
-			ci = dynamic_cast<QCheckListItem*>(it.current());
-			if (ci && ci->isOn()) {
-				break;
-			}
-			it++;
-		}
-		if ( ci && ci->isOn() ) { //a module is checked in the list
-			m_removeRemoveButton->setEnabled(true);
-    }
-		else {
-			m_removeRemoveButton->setEnabled(false);
-		}
-	}
-}
-
-/** No descriptions */
-void CSwordSetupDialog::populateRemoveModuleListView(){
-	m_removeRemoveButton->setEnabled(false);
-
-	CSwordBackend myBackend;
-	KApplication::kApplication()->processEvents();
-	myBackend.initModules();
-
-	m_removeModuleListView->clear();
-
-	QListViewItem* categoryBible = new QListViewItem(m_removeModuleListView, i18n("Bibles"));
-	QListViewItem* categoryCommentary = new QListViewItem(m_removeModuleListView, i18n("Commentaries"));
-	QListViewItem* categoryLexicon = new QListViewItem(m_removeModuleListView, i18n("Lexicons"));
-	QListViewItem* categoryBook = new QListViewItem(m_removeModuleListView, i18n("Books"));
-	QListViewItem* categoryDevotionals = new QListViewItem(m_removeModuleListView, i18n("Daily Devotionals"));
-	QListViewItem* categoryGlossaries = new QListViewItem(m_removeModuleListView, i18n("Glossaries"));
-
-  categoryBible->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryCommentary->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryLexicon->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryBook->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryDevotionals->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryGlossaries->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-
-
-  categoryBible->setOpen(true);
-  categoryCommentary->setOpen(true);
-  categoryLexicon->setOpen(true);
-  categoryBook->setOpen(true);
-  categoryDevotionals->setOpen(true);
-  categoryGlossaries->setOpen(true);
-
-	QPtrList<CSwordModuleInfo> list = myBackend.moduleList();
-	int modcount = list.count();
-	int mod = 0;
-	QListViewItem* newItem = 0;
-	QListViewItem* parent = 0;
-	sword::SWConfig moduleConfig("");
-
-	for ( list.first(), mod = 1; list.current(); list.next(), mod++ ){
-		if (mod % 20){
-			m_populateListNotification->setText(i18n("Scanning your modules: %1%").arg((mod*100)/modcount));
-			//KApplication::kApplication()->processEvents();
-			m_removeModuleListView->triggerUpdate();
-		}
-
-		switch (list.current()->type()) {
-			case CSwordModuleInfo::Bible:
-        parent = categoryBible;
-				break;
-			case CSwordModuleInfo::Commentary:
-        parent = categoryCommentary;
-				break;
-			case CSwordModuleInfo::Lexicon:
-        parent = categoryLexicon;
-				break;
-			case CSwordModuleInfo::GenericBook:
-        parent = categoryBook;
-				break;
-      default:
-        parent = 0; //shouldn't happen;
-        break;
-		}
-
-		//handling for special module types
-		if ((parent == categoryLexicon) && (list.current()->category() == CSwordModuleInfo::Glossary)) {
-			parent = categoryGlossaries;
-		}
-		if ((parent == categoryLexicon) && (list.current()->category() == CSwordModuleInfo::DailyDevotional)) {
-			parent = categoryDevotionals;
-		}
-
-		//now we know the category, find the right language group in that category
-		CLanguageMgr::Language lang = list.current()->language();
-		QString langName = lang.translatedName();
-		if (!lang.isValid()) {
-			langName = QString::fromLatin1(list.current()->module()->Lang());
-		}
-
-		QListViewItem * langFolder = parent->firstChild();
-    while( langFolder ) { //try to find language folder if it exsists
-			if (langFolder->text(0) == langName) { //found right folder
-				break;
-			}
-			langFolder = langFolder->nextSibling();
-		}
-
-		if (!langFolder) { //not yet there
-			langFolder = new QListViewItem(parent, langName);
-			langFolder->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-			langFolder->setOpen(true);
-		}
-
-		newItem = new QCheckListItem(langFolder, list.current()->name(), QCheckListItem::CheckBox);
-    newItem->setPixmap(0, CToolClass::getIconForModule(list.current()));
-		newItem->setText(1,list.current()->config(CSwordModuleInfo::AbsoluteDataPath));
-  }
-
-	m_populateListNotification->setText("");
-
-  //clean up groups
-  if (!categoryBible->childCount())
-    delete categoryBible;
-  if (!categoryCommentary->childCount())
-    delete categoryCommentary;
-  if (!categoryBook->childCount())
-    delete categoryBook;
-  if (!categoryLexicon->childCount())
-    delete categoryLexicon;
-  if (!categoryDevotionals->childCount())
-    delete categoryDevotionals;
-  if (!categoryGlossaries->childCount())
-    delete categoryGlossaries;
-}
-
-/** No descriptions */
-void CSwordSetupDialog::populateInstallModuleListView( const QString& sourceName ){
-  KApplication::kApplication()->processEvents();
-	if (!m_installModuleListView) { // it may be an update after removing modules, so the widgets we need do not have to exist
-		return;
-	}
-	
-	m_installModuleListView->clear();
-
-	QListViewItem* categoryBible = new QListViewItem(m_installModuleListView, i18n("Bibles"));
-	QListViewItem* categoryCommentary = new QListViewItem(m_installModuleListView, i18n("Commentaries"));
-	QListViewItem* categoryLexicon = new QListViewItem(m_installModuleListView, i18n("Lexicons"));
-	QListViewItem* categoryBook = new QListViewItem(m_installModuleListView, i18n("Books"));
-	QListViewItem* categoryDevotionals = new QListViewItem(m_installModuleListView, i18n("Daily Devotionals"));
-	QListViewItem* categoryGlossaries = new QListViewItem(m_installModuleListView, i18n("Glossaries"));
-
-  categoryBible->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryCommentary->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryLexicon->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryBook->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryDevotionals->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-  categoryGlossaries->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-
-  categoryBible->setOpen(true);
-  categoryCommentary->setOpen(true);
-  categoryLexicon->setOpen(true);
-  categoryBook->setOpen(true);
-  categoryDevotionals->setOpen(true);
-  categoryGlossaries->setOpen(true);
-
-  BTInstallMgr iMgr;
-//	qWarning("trying to find source %s!", sourceName.latin1());
-	sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, sourceName);
-//	qWarning("found source %s with dir %s!", is.caption.c_str(), is.directory.c_str());
-
-  if (BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) {
-    if (!m_refreshedRemoteSources) {
-      iMgr.refreshRemoteSource( &is );
-		}
-    m_refreshedRemoteSources = true;
-  }
-
-  //kind of a hack to provide a pointer to mgr next line
-  util::scoped_ptr<CSwordBackend> backend( BTInstallMgr::Tool::backend(&is) );
-  if (!backend)
-    return;
-
-  QListViewItem* parent = 0;
-  ListCSwordModuleInfo mods = backend->moduleList();
-  for (CSwordModuleInfo* newModule = mods.first(); newModule; newModule = mods.next()) {
-    bool isUpdate = false;
-    CSwordModuleInfo* const installedModule = CPointers::backend()->findModuleByName(newModule->name());
-    if (installedModule) { //module already installed?
-      //check whether it's an uodated module or just the same
-      const SWVersion installedVersion( installedModule->config(CSwordModuleInfo::ModuleVersion).latin1() );
-      const SWVersion newVersion( newModule->config(CSwordModuleInfo::ModuleVersion).latin1() );
-      isUpdate = (newVersion > installedVersion);
-
-			if (!isUpdate)
-        continue;
-    }
-
-    if (newModule->isLocked() || newModule->isEncrypted()) { //encrypted modules have no data files on the server
-      continue;
-		}
-
-    switch (newModule->type()) {
-      case CSwordModuleInfo::Bible:
-        parent = categoryBible;
-        break;
-      case CSwordModuleInfo::Commentary:
-        parent = categoryCommentary;
-        break;
-      case CSwordModuleInfo::Lexicon:
-        parent = categoryLexicon;
-        break;
-      case CSwordModuleInfo::GenericBook:
-        parent = categoryBook;
-        break;
-      default:
-        parent = 0;
-        break;
-    }
-
-		//handling for special module types
-		if ((parent == categoryLexicon) && (newModule->category() == CSwordModuleInfo::Glossary)) {
-			parent = categoryGlossaries;
-		}
-		if ((parent == categoryLexicon) && (newModule->category() == CSwordModuleInfo::DailyDevotional)) {
-			parent = categoryDevotionals;
-		}
-
-		//now we know the category, find the right language group in that category
-		CLanguageMgr::Language lang = newModule->language();
-		QString langName = lang.translatedName();
-		if (!lang.isValid())
-			langName = QString::fromLatin1(newModule->module()->Lang());
-
-		QListViewItem * langFolder = parent->firstChild();
-    while( langFolder ) { //try to find language folder if it exsists
-			if (langFolder->text(0) == langName) //found right folder
-				break;
-			langFolder = langFolder->nextSibling();
-		}
-
-		if (!langFolder) { //not yet there
-			langFolder = new QListViewItem(parent, langName);
-			langFolder->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-			langFolder->setOpen(true);
-		}
-
-		QListViewItem* newItem = 0;
-    if (langFolder) {
-    	newItem = new QCheckListItem(langFolder, newModule->name(), QCheckListItem::CheckBox);
-    }
-    else { //shouldn't happen
-    	newItem = new QCheckListItem(m_installModuleListView, newModule->name(), QCheckListItem::CheckBox);
-    }
-
-    newItem->setPixmap(0, CToolClass::getIconForModule(newModule));
-    newItem->setText(1, installedModule ? installedModule->config(CSwordModuleInfo::ModuleVersion) : "");
-    newItem->setText(2, newModule->config(CSwordModuleInfo::ModuleVersion));
-    newItem->setText(3, isUpdate ? i18n("Updated") : i18n("New"));
-  }
-
-  //clean up groups
-  if (!categoryBible->childCount())
-    delete categoryBible;
-  if (!categoryCommentary->childCount())
-    delete categoryCommentary;
-  if (!categoryBook->childCount())
-    delete categoryBook;
-  if (!categoryLexicon->childCount())
-    delete categoryLexicon;
-  if (!categoryDevotionals->childCount())
-    delete categoryDevotionals;
-  if (!categoryGlossaries->childCount())
-    delete categoryGlossaries;
-}
-
-/** Connects to the chosen source. */
-void CSwordSetupDialog::slot_connectToSource(){
-//	qWarning("connectToSource - creating new widgets");
-	if (!m_installModuleListPage) { //the widgets are not yet created
-		m_installModuleListPage = new QWidget(0);
-
-		QGridLayout* layout = new QGridLayout(m_installModuleListPage, 7, 2);
-		layout->setMargin(5);
-		layout->setSpacing(10);
-
-		QLabel* installLabel = CToolClass::explanationLabel(m_installModuleListPage,
-			i18n("Install/update modules - Step 2"),
-			i18n("Please choose the modules which should be installed / updated and click the install button.")
-		);
-		layout->addMultiCellWidget(installLabel, 0,0,0,1);
-		layout->setRowStretch(0,0);
-
-		m_installWidgetStack->addWidget(m_installModuleListPage);
-		m_installModuleListPage->setMinimumSize(500,400);
-
-		//insert a list box which contains all available remote modules
-		m_installModuleListView = new KListView(m_installModuleListPage, "install modules view");
-		layout->addMultiCellWidget( m_installModuleListView, 1,6,0,1);
-		layout->setColStretch(0,5);
-		layout->setRowStretch(1,5);
-
-		m_installModuleListView->addColumn(i18n("Name"));
-		m_installModuleListView->addColumn(i18n("Installed version"));
-		m_installModuleListView->addColumn(i18n("Remote version"));
-		m_installModuleListView->addColumn(i18n("Status"));
-		m_installModuleListView->setAllColumnsShowFocus(true);
-		m_installModuleListView->setFullWidth(true);
-		m_installModuleListView->setRootIsDecorated(true);
-		connect(m_installModuleListView, SIGNAL(pressed(QListViewItem*)),
-			SLOT(slot_installModuleItemExecuted(QListViewItem*)));
-		connect(m_installModuleListView, SIGNAL(spacePressed(QListViewItem*)),
-			SLOT(slot_installModuleItemExecuted(QListViewItem*)));
-	}
-
-	//code valid for already existing and newly created widgets
-  m_installContinueButton->setEnabled(false);
-  disconnect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_connectToSource()));
-  connect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_installModules()));
-
-  populateInstallModuleListView( currentInstallSource() );
-  m_installContinueButton->setText(i18n("Install modules"));
-  m_installContinueButton->setEnabled(false);
-
-  m_installWidgetStack->raiseWidget(m_installModuleListPage);
-
-  connect( m_installBackButton, SIGNAL(clicked()), this, SLOT(slot_showInstallSourcePage()));
-  m_installBackButton->setEnabled(true);
-}
-
-/** Connects to the chosen source. */
-void CSwordSetupDialog::slot_installManageSources() {
-	CInstallSourcesMgrDialog* dlg = new CInstallSourcesMgrDialog(this);
-	dlg->exec();
-
-	populateInstallCombos(); //make sure the items are updated
-}
-
-void CSwordSetupDialog::slot_installModuleItemExecuted(QListViewItem* item) {
-	// This function enabled the Install modules button if modules are chosen
-	// If an item was clicked to be not chosen look if there are other selected items
-	// If the item was clicked to be chosen enable the button without looking at the other items
-
-	QCheckListItem* checkItem = dynamic_cast<QCheckListItem*>(item);
-	if (item && !checkItem) //no valid item for us
-		return;
-
-	if (checkItem && checkItem->isOn()) {
-		m_installContinueButton->setEnabled(true);
-	}
-	else {
-		QListViewItemIterator it( m_installModuleListView );
-		QCheckListItem* ci = 0;
-		while (it.current()) {
-			ci = dynamic_cast<QCheckListItem*>(it.current());
-			if (ci && ci->isOn()) {
-				break;
-			}
-			it++;
-		}
-		if ( ci && ci->isOn() ) { //a module is checked in the list
-			m_installContinueButton->setEnabled(true);
-    }
-		else {
-			m_installContinueButton->setEnabled(false);
-		}
-	}
-}
-
-/** Installs chosen modules */
-void CSwordSetupDialog::slot_installModules(){
-	m_installContinueButton->setEnabled(false);
-	m_installBackButton->setEnabled(false);
-
-	//first get all chosen modules
-	QStringList moduleList;
-
-	QListViewItemIterator list_it( m_installModuleListView );
-	while ( list_it.current() ) {
-		QCheckListItem* i = dynamic_cast<QCheckListItem*>( list_it.current() );
-		if (i && i->isOn()) {
-			moduleList << list_it.current()->text(0);
-		}
-		++list_it;
-	}
-
-	const QString& message = i18n("You selected the following modules: %1.\n\nDo you really want to install them on your system?").arg(moduleList.join(", "));
-
-	if ((KMessageBox::warningYesNo(0, message, i18n("Warning")) == KMessageBox::Yes)){  //Yes was pressed.
-    BTInstallMgr iMgr;
-		m_currentInstallMgr = &iMgr;
-    sword::InstallSource is = BTInstallMgr::Tool::RemoteConfig::source(&iMgr, currentInstallSource());
-
-//		qWarning("installung from %s/%s", is.source.c_str(), is.directory.c_str());
-    QString target = m_targetCombo->currentText();
-
-		//make sure target/mods.d and target/modules exist
-    QDir dir(target.latin1());
-    if (!dir.exists()) {
-      dir.mkdir(target, true);
-    }
-    if (!dir.exists("modules")) {
-      dir.mkdir("modules");
-    }
-    if (!dir.exists("mods.d")) {
-      dir.mkdir("mods.d");
-    }
-
-    sword::SWMgr lMgr( target.latin1() );
-
-    //module are removed in this section of code
-		m_installedModuleCount = 0;
-    m_progressDialog = new KProgressDialog(0,0,i18n("Module installation ..."), QString::null, true);
-    m_progressDialog->progressBar()->setTotalSteps(100 * moduleList.count());
-		connect(m_progressDialog, SIGNAL(cancelClicked()), SLOT(slot_installProgressCancelClicked()));
-
-    connect(&iMgr, SIGNAL(completed(const int, const int)), SLOT(installCompleted(const int, const int)));
-
-		for ( QStringList::Iterator it = moduleList.begin(); (it != moduleList.end()) && !m_progressDialog->wasCancelled(); ++it, ++m_installedModuleCount ) {
-
-			m_installingModule = *it;
-
-      //check whether it's an update. If yes, remove exuisting module first
-      if (CSwordModuleInfo* m = backend()->findModuleByName(*it)) { //module found?
-        QString prefixPath = m->config(CSwordModuleInfo::AbsoluteDataPath) + "/";
-        QString dataPath = m->config(CSwordModuleInfo::DataPath);
-        if (dataPath.left(2) == "./") {
-          dataPath = dataPath.mid(2);
-        }
-
-        if (prefixPath.contains(dataPath)) {
-					prefixPath.remove( prefixPath.find(dataPath), dataPath.length() );	//compilcated to work with Qt 3.0
-          //prefixPath = prefixPath.replace(dataPath, ""); //old code working with Qt 3.2
-        }
-        else {
-          prefixPath = QString::fromLatin1(backend()->prefixPath);
-        }
-        sword::SWMgr mgr(prefixPath.latin1());
-        iMgr.removeModule(&mgr, m->name().latin1());
-      }
-
-      if (!m_progressDialog->wasCancelled() && BTInstallMgr::Tool::RemoteConfig::isRemoteSource(&is)) {
-        iMgr.installModule(&lMgr, 0, (*it).latin1(), &is);
-      }
-      else if (!m_progressDialog->wasCancelled()) { //local source
-        iMgr.installModule(&lMgr, is.directory.c_str(), (*it).latin1());
-      }
-    }
-		delete m_progressDialog;
-		m_progressDialog = 0;
-
-    //reload our backend because modules may have changed
-    backend()->reloadModules();
-    populateInstallModuleListView( currentInstallSource() ); //rebuild the tree
-    populateRemoveModuleListView();
-  }
-
-	m_currentInstallMgr = 0;
-	m_installBackButton->setEnabled(true);
-	slot_installModuleItemExecuted(0);
-}
-
-/** No descriptions */
-void CSwordSetupDialog::installCompleted( const int total, const int /* file */){
-	if (m_progressDialog) {
-    m_progressDialog->progressBar()->setProgress(total+100*m_installedModuleCount);
-    m_progressDialog->setLabel( i18n("[%1]: %2% complete").arg(m_installingModule).arg(total) );
-  }
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_showInstallSourcePage(){
-  connect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_connectToSource()));
-  disconnect( m_installContinueButton, SIGNAL(clicked()), this, SLOT(slot_installModules()));
-  m_installBackButton->setEnabled(false);
-
-	m_installContinueButton->setText(i18n("Connect to source"));
-  m_installContinueButton->setEnabled(true);
-
-  m_installWidgetStack->raiseWidget(m_installSourcePage);
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_swordEditClicked(){
-  if (QListViewItem* i = m_swordPathListBox->currentItem()) {
-    KURL url = KDirSelectDialog::selectDirectory(i->text(0), true);
-		if (url.isValid()) {
-			const QFileInfo fi( url.path() );
-			if (fi.exists() && fi.isWritable()) {
-				i->setText(0, url.path());
-				populateInstallCombos(); //update target list bof on install page
-			}
-			else {
-				const int result = KMessageBox::warningYesNo(this, i18n("This directory is not writable, so modules can not be installed here using BibleTime. Do you want to use this directory instead of the previous value?"));
-				if (result == KMessageBox::Yes) {
-					i->setText(0, url.path());
-					populateInstallCombos(); //update target list bof on install page
-				}
-			}
-		}
-  }
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_swordAddClicked(){
-  KURL url = KDirSelectDialog::selectDirectory(QString::null, true);
-  if (url.isValid()) {
-		const QFileInfo fi( url.path() );
-		if (fi.exists() && fi.isWritable()) {
-	    (void)new KListViewItem(m_swordPathListBox, url.path());
-			populateInstallCombos(); //update target list bof on install page
-		}
-		else {
-			const int result = KMessageBox::warningYesNo(this, i18n("This directory is not writable, so modules can not be installed here using BibleTime. Do you want to add it to the list of module directories?"));
-			if (result == KMessageBox::Yes) {
-		    (void)new KListViewItem(m_swordPathListBox, url.path());
-				populateInstallCombos(); //update target list bof on install page
-			}
-		}
-  }
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_swordRemoveClicked(){
-  if (QListViewItem* i = m_swordPathListBox->currentItem()) {
-    delete i;
-		populateInstallCombos(); //update target list bof on install page
-  }
-}
-
-/** Setup the path list box */
-void CSwordSetupDialog::setupSwordPathListBox(){
-  QStringList targets = BTInstallMgr::Tool::LocalConfig::targetList();
-  m_swordPathListBox->clear();
-
-  for (QStringList::iterator it = targets.begin(); it != targets.end(); ++it)  {
-    if ((*it).isEmpty()) {
-      continue;
-		}
-    new KListViewItem(m_swordPathListBox, *it);
-  }
-  m_swordPathListBox->setCurrentItem( m_swordPathListBox->firstChild() );
-}
-
-/** No descriptions */
-void CSwordSetupDialog::slot_swordPathSelected(){
-  m_swordEditPathButton->setEnabled( m_swordPathListBox->currentItem() );
-}
-
-/*!
-    \fn CSwordSetupDialog::remoteCurrentInstallSource()
- */
-const QString CSwordSetupDialog::currentInstallSource() {
-	QString source = m_sourceCombo->currentText();
-	//source = source.remove( i18n("[Local]") + " " );
-	QString rep = i18n("[Local]") + " ";
-	int i = source.find(rep);
-	if (i>=0)
-		source.remove(i, rep.length());
-
-	//source = source.remove( i18n("[Remote]") + " " );
-	rep = i18n("[Remote]") + " ";
-	i = source.find(rep);
-	if (i>=0)
-		source.remove(i, rep.length());
-
-	return source;
-}
-
-void CSwordSetupDialog::slot_installProgressCancelClicked() {
-	//the cancel button of the progress dialog was clicked.
-	//m_progressDialog->wasCancelled()
-
-	//cancel possible active module installation
-	if (m_currentInstallMgr) {
-		m_currentInstallMgr->terminate = true;
-	}
-}
diff --git a/bibletime/frontend/cswordsetupdialog.h b/bibletime/frontend/cswordsetupdialog.h
deleted file mode 100644
index 2fe58f0..0000000
--- a/bibletime/frontend/cswordsetupdialog.h
+++ /dev/null
@@ -1,218 +0,0 @@
-/***************************************************************************
-                          coptionsdialog.h  -  description
-                             -------------------
-    begin                : Wed Jan 19 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSWORDSETUPDIALOG_H
-#define CSWORDSETUPDIALOG_H
-
-#include "cbtconfig.h"
-#include "util/cpointers.h"
-#include "btinstallmgr.h"
-
-//QT includes
-#include <qstring.h>
-#include <qmap.h>
-#include <qlistview.h>
-#include <qurl.h>
-
-//KDE includes
-#include <kdialogbase.h>
-#include <klistview.h>
-
-
-//Sword includes
-class QWidget;
-class QLabel;
-class QComboBox;
-class QWidgetStack;
-class QButton;
-class QPushButton;
-class QLineEdit;
-
-class KProgressDialog;
-// class KListView;
-
-class CInstallSourcesMgrDialog : public KDialogBase, public CPointers  {
-   Q_OBJECT
-
-public:
-	CInstallSourcesMgrDialog(QWidget *parent=0, const char *name=0);
-
-protected:
-
-	class InstallSourceItem : public KListViewItem {
-	public:
-		InstallSourceItem( KListView* parent );
-		InstallSourceItem( KListView* parent, sword::InstallSource );
-
-		const QUrl& url() const;
-		void setURL(const QUrl& url);
-
-		void setServer(const QString& server);
-		const QString server() const;
-
-		void setPath(const QString& server);
-		const QString path() const;
-
-		const QString& caption() const;
-		void setCaption( const QString& caption );
-
-//		const bool isEnabled() const;
-//		void setEnabled( const bool enabled );
-
-		sword::InstallSource swordInstallSource();
-
-	private:
-		void updateItem();
-
-		QUrl m_url;
-		QString m_caption;
-	};
-
-	void initRemoteSourcesPage();
-	void initLocalSourcesPage();
-	void updateRemoteURLLabel();
-
-protected slots:
-	void slot_localAddSource();
-	void slot_localRemoveSource();
-
-	void slot_remoteAddSource();
-	void slot_remoteChangeSource();
-	void slot_remoteRemoveSource();
-	void slot_remoteSourceSelectionChanged();
-	void slot_remoteCaptionChanged(const QString&);
-	void slot_remoteServerChanged(const QString&);
-	void slot_remotePathChanged(const QString&);
-
-	void slotOk();
-
-private:
-	QFrame* m_localSourcesPage;
-	KListView* m_localSourcesList;
-
-	QFrame* m_remoteSourcesPage;
-	KListView* m_remoteSourcesList;
-	QLineEdit* m_remoteCaptionEdit;
-	QLineEdit* m_remoteServerEdit;
-	QLineEdit* m_remotePathEdit;
-	QLabel* m_remoteURLLabel;
-};
-
-
-/**
-	* The Sword configuration dialog of BibleTime
-  * @author The BibleTime Team
-  */
-class CSwordSetupDialog : public KDialogBase, public CPointers  {
-   Q_OBJECT
-
-public:
-	CSwordSetupDialog(QWidget *parent=0, const char *name=0);
-
-  enum Parts {
-		Sword,
-		Install,
-		Remove
-  };
-
-  /** Opens the page which contaisn the given part ID. */
-  const bool showPart( CSwordSetupDialog::Parts ID, const bool exclusive = false );
-
-private:
-  void initSwordConfig();
-  void initInstall();
-	void initRemove();
-
-  /** Setup the path list box */
-	void setupSwordPathListBox();
-
-	void populateInstallCombos();
-
-	const QString currentInstallSource();
-
-  QFrame* m_swordConfigPage;
-  KListView* m_swordPathListBox;
-  QPushButton* m_swordEditPathButton;
-  QPushButton* m_swordAddPathButton;
-  QPushButton* m_swordRemovePathButton;
-  QStringList m_swordPathList;
-
-  QFrame* m_removePage;
-
-  QFrame* m_installPage;
-	QWidgetStack* m_installWidgetStack;
-
-	QString source;
-  QString target;
-
-	QLabel* m_sourceLabel;
-	QLabel* m_targetLabel;
-	QComboBox* m_sourceCombo;
-	QComboBox* m_targetCombo;
-
-	QMap<QString, QString> m_targetMap;
-
-	KListView* m_removeModuleListView;
-	QLabel* m_populateListNotification;
-	QPushButton* m_removeRemoveButton;
-
-  void populateRemoveModuleListView();
-  void populateInstallModuleListView(const QString& sourceName);
-
-//install module stuff
-  QPushButton* m_installBackButton;
-  QPushButton* m_installContinueButton;
-
-  QWidget* m_installModuleListPage;
-  QWidget* m_installSourcePage;
-
- 	KListView* m_installModuleListView;
-  KProgressDialog* m_progressDialog;
-  QString m_installingModule;
-  bool m_refreshedRemoteSources;
-	unsigned int m_installedModuleCount;
-
-	BTInstallMgr* m_currentInstallMgr; //pointer to the current installmgr object so we can access it in the cancel install slot
-
-private slots:
-  void slot_sourceSelected(const QString &sourceName);
-  void slot_targetSelected(const QString &targetName);
-
-	void slot_doRemoveModules();
-	void slot_removeModuleItemExecuted(QListViewItem*);
-
-	void slotOk();
-	void slotApply();
-  void slot_connectToSource();
-
-	void slot_installManageSources();
-  void slot_installModules();
-	void slot_installModuleItemExecuted(QListViewItem*);
-	void slot_installProgressCancelClicked();
-  void slot_showInstallSourcePage();
-
-  void installCompleted( const int, const int );
-  void slot_swordRemoveClicked();
-  void slot_swordAddClicked();
-  void slot_swordEditClicked();
-  void slot_swordPathSelected();
-
-signals: // Signals
-  void signalSwordSetupChanged();
-};
-
-#endif //CSWORDSETUPDIALOG_H
diff --git a/bibletime/frontend/ctooltip.cpp b/bibletime/frontend/ctooltip.cpp
deleted file mode 100644
index a147dac..0000000
--- a/bibletime/frontend/ctooltip.cpp
+++ /dev/null
@@ -1,254 +0,0 @@
-/***************************************************************************
-                          ctooltip.cpp  -  description
-                             -------------------
-    begin                : Don Mai 30 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "ctooltip.h"
-
-//Qt includes
-#include <qobject.h>
-#include <qobjectlist.h>
-#include <qtooltip.h>
-#include <qlayout.h>
-#include <qcursor.h>
-#include <qbitmap.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <dom/html_element.h>
-
-static QRect screenSize; // = QRect();
-
-CToolTip::CToolTip(QWidget *parent, const char *name ) : QFrame( 0, name, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM ),
-  m_filter(false), m_parentWidget( parent ) {
-
-  connect(m_parentWidget, SIGNAL(destroyed()), SLOT(destroyObject()));
-
-  QHBoxLayout* layout = new QHBoxLayout(this,0,0);
-  layout->setResizeMode(QLayout::FreeResize);
-
-  hide();  
-  m_display = new KHTMLPart(this);
-  m_display->view()->setMarginWidth(4);
-  m_display->view()->setMarginHeight(4);
-  layout->addWidget(m_display->view());
-
-  //set the size for the tooltip now only one time, and not everytime in tip()
-  screenSize = KApplication::desktop()->geometry();
-  setMaximumHeight( int(screenSize.height()*0.6) );
-  setFixedWidth( int(screenSize.width()*0.25) );  
-  m_display->view()->setHScrollBarMode(QScrollView::AlwaysOff); //never show a horizontal bar, only the vertcal one
-
-  setPalette( QToolTip::palette() );
-  setMargin( 1 );
-  setFrameStyle( QFrame::Plain | QFrame::Box );
-  m_parentWidget->installEventFilter(this);
-  setFilter(false);
-}
-
-/** This function shows a tip with the given text. The tip disappears if the mouse moves out of the rectangle rect. */
-void CToolTip::tip( const QPoint& p, const QRect& rect, const QString& text ){
-  //m_tipRect must have global coordinates!
-  QPoint globalPos = parentWidget()->mapToGlobal(rect.topLeft());
-  m_tipRect = QRect(globalPos.x(), globalPos.y(), rect.width(), rect.height());
-
-  m_display->begin();
-  m_display->write(text);
-  m_display->end();
-
-
-  //original code
-//  show();
-//  m_display->view()->layout(); //refresh painted text etc.
-//  resize(m_display->view()->sizeHint());
-
-  // the maximum size was set in our constructor, so we won't grow too large
-  // resize((int)((float)screenSize.width()*0.6), 0);
-//  resize(int(double(screenSize.width())*0.50),1);
-
-  show();
-  m_display->view()->layout();
-    
-  // resize to the size hint,
-  // we can't grow too large because maximumSize was set in the constructor
-  resize( sizeHint().width(),  m_display->view()->height()+4 );
-    
-  // if the scrollbar is not visible position the tooltip
-  // that the tip will be hidden as soon as the mouse will be moved
-  // if the bar s visible position the tip under the mouse so moving the bar is still possible
-  const QPoint mp = (m_display->view()->verticalScrollBar()->isVisible()) ? QPoint(p.x()-10, p.y()-10) : QPoint(p.x()+10, p.y()+10);
-  QPoint pos = parentWidget()->mapToGlobal( mp );
-  QRect widgetRect = QRect(pos.x(), pos.y(), width(), height());
-  if (!KApplication::desktop()->geometry().contains(widgetRect, true)) {
-    //the tooltip would be outside of the screen, move inside the screen now
-    QRect intersect = KApplication::desktop()->geometry().intersect(widgetRect);
-    widgetRect.moveBy(-(widgetRect.width()-intersect.width()),-(widgetRect.height()-intersect.height()));
-    pos = widgetRect.topLeft();
-  }
-  move(pos);
-
-  m_display->view()->setContentsPos(0,0); //show from the bgeinning, reset any scrollbar position
-}
-
-/** Reimplementation. */
-void CToolTip::timerEvent( QTimerEvent*  ) {
-  killTimers();
-  if ( !isVisible() ) {
-    maybeTip( parentWidget()->mapFromGlobal(QCursor::pos()) );
-  }
-  else {
-    hide();
-  }
-}
-
-/** Reimplementation. */
-bool CToolTip::eventFilter( QObject *o, QEvent *e ){
-  if (o == parentWidget()) {
-    if (e->type() == QEvent::Show) {
-      setFilter(true);
-      return false;
-    }
-  }
-
-  QMouseEvent* me = dynamic_cast<QMouseEvent*>(e);  
-  switch ( e->type() ) {
-    case QEvent::MouseButtonPress: {
-      //we have not yet shown the tip, but while the timer is running for this a drag was started
-      if (me && !isVisible() && ((me->state() != NoButton) || (me->stateAfter() != Qt::NoButton))) {
-        killTimers();
-        hide();
-        break;
-      }
-
-      if ( !m_display->view()->verticalScrollBar()->isVisible()
-		||  (m_display->view()->verticalScrollBar()->isVisible() && !widgetContainsPoint(m_display->view()->verticalScrollBar(),
-            me->globalPos() )
-      ))
-    {
-        killTimers();
-        hide();
-        break;
-      }
-      break;
-    }
-      
-    case QEvent::MouseButtonRelease: {
-      //allow clicking on the scrollbar for reading the text
-      if (      m_display->view()->verticalScrollBar()->isVisible()
-          && (m_display->view()->verticalScrollBar()->draggingSlider() || widgetContainsPoint(m_display->view()->verticalScrollBar(), me->globalPos()))
-      ) {
-        break;
-      }
-      else {
-        hide();
-        break;
-      }
-      break;
-    }
-    
-    case QEvent::KeyPress: //fall through
-    case QEvent::KeyRelease: //fall though
-    case QEvent::FocusIn: //fall though
-    case QEvent::FocusOut:
-      killTimers();
-      hide();
-      break;
-
-    case QEvent::MouseMove:
-    {
-      const bool validMousePos = //true when the mouse is at a valid position, false if not. In this case hide the tooltip.
-				 widgetContainsPoint(this, me->globalPos())
-              || m_tipRect.contains( me->globalPos() )
-              || m_display->view()->verticalScrollBar()->draggingSlider(); //if the user's scrolling and moved the mouse out of the area
-
-      if (isVisible() && !validMousePos) { //mouse moved outside the visible tooltip area!
-        hide();
-        break;
-      }
-      if (isVisible() && validMousePos) { //moving withing the tooltip area or dragging the scroll bar
-        break;
-      }
-
-      if (me) {
-        if (!m_display->view()->verticalScrollBar()->draggingSlider() && //user doesn't scoll at the moment
-            ((me->state() != Qt::NoButton) || (me->stateAfter() != Qt::NoButton))) //probaby dragging at the moment - show no tip
-        {   
-          killTimers();
-          hide();
-          break;
-        }
-
-        if (QWidget* w = KApplication::widgetAt( me->globalPos(), true )) { //check whether parentWidget is visible on top
-          while ( w && (w != parentWidget()) ) {
-            if (w->isPopup()) {
-				break;
-			}
-			
-            w = w->parentWidget();
-          }
-
-          const bool validPopup = KApplication::activePopupWidget() ? (KApplication::activePopupWidget() == parentWidget()) : true;
-          if (w && (w == parentWidget()) && validPopup) { //inside the parent widget and not a popup which appears outside of parentwidget
-		  	// if we processed the event of one of parentWidget()'s childs
-		   // but we have to make sure the toplevel widget isn't a child popup of the parent widget which hides the parent
-		   // In this case the tooltip would be wrong
-		   
-            startTimer(1500);
-          }
-          else {
-            killTimers();
-            break;
-          };
-        }
-      }
-      break;
-    }
-    default:
-      break;
-  }
-  return false;
-}
-
-/** Sets the tooltip on or off. */
-void CToolTip::setFilter( const bool enable ){
-  if ( enable == m_filter ) return;  //nothing changed
-
-  if ( enable ) {
-     KApplication::kApplication()->installEventFilter( this );
-     KApplication::setGlobalMouseTracking( true );
-  }
-  else {
-     KApplication::setGlobalMouseTracking( false );
-     KApplication::kApplication()->removeEventFilter( this );
-  }
-  m_filter = enable;
-}
-
-/** A helper function which returns true if the given widget contains the global pos p. */
-const bool CToolTip::widgetContainsPoint( QWidget* const w, const QPoint& p ){
-  const QPoint origin = w->mapToGlobal(QPoint(0,0));
-  if (p.x() >= origin.x() && p.x() <= w->mapToGlobal(QPoint(w->width(),w->height())).x() ) { //X is valid
-    if (p.y() >= origin.y() && p.y() <= w->mapToGlobal(QPoint(w->width(),w->height())).y() ) { //Y is valid
-      return true;
-    }
-  }
-  return false;
-}
-
-/** No descriptions */
-void CToolTip::destroyObject(){
-  setFilter(false);
-  deleteLater();
-}
diff --git a/bibletime/frontend/ctooltip.h b/bibletime/frontend/ctooltip.h
deleted file mode 100644
index 84ca3ca..0000000
--- a/bibletime/frontend/ctooltip.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/***************************************************************************
-                          ctooltip.h  -  description
-                             -------------------
-    begin                : Don Mai 30 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CTOOLTIP_H
-#define CTOOLTIP_H
-
-#include <qwidget.h>
-#include <qframe.h>
-
-//KDE includes
-#include <khtml_part.h>
-#include <khtmlview.h>
-
-/** Our own ToolTip widget which uses KHTMLView to display the tooltip.
-	* Portions the code were inspired by Konqueror's tooltip code
-	* @author The BibleTime team
-  	*/
-class CToolTip : public QFrame  {
-   Q_OBJECT
-public: 
-	CToolTip(QWidget *parent=0, const char *name=0);
-//	virtual ~CToolTip();
-  /**
-  * Returns the widget this tooltip applies to. This tooltip widget is destroyed when he parent is deleted.
-  */
-  QWidget* const parentWidget() const;
-
-protected: // Protected methods
-  /**
-  * This function shows a tip with the given text.
-  * The tooltip will open at the position p on the screen. When the mouse moves out of
-  * the rectangle rect the tooltip will disappear.
-  * The point p must be in the rectangle rect, otherwise the behaviour of CToolTip will be incorrect!
-  */
-  void tip( const QPoint& p, const QRect& rect, const QString& text );
-  /**
-  * This function is called when a tooltip may be displayed at position p.
-  * Reimplement this function to manage the appearance of tooltips.
-  */
-  virtual void maybeTip( const QPoint& p ) = 0;
-
-private:
-  /**
-  * Reimplementation.
-  */
-  virtual void timerEvent( QTimerEvent* e );
-  /**
-  * Sets the tooltip on or off.
-  */
-  void setFilter( const bool enable );
-  /**
-  * Reimplementation.
-  */
-  virtual bool eventFilter( QObject *, QEvent *e );
-  /**
-  * A helper function which returns true if the given widget contains the global pos p.
-  */
-  const bool widgetContainsPoint( QWidget* const w, const QPoint& p );
-
-  bool m_filter;
-  QWidget* m_parentWidget;
-  KHTMLPart* m_display;
-  QRect m_tipRect;
-
-private slots: // Private slots
-  void destroyObject();
-};
-
-/** Returns the widget this tooltip applies to. This tooltip widget is destroyed when he parent is deleted. */
-inline QWidget* const CToolTip::parentWidget() const{
-  return m_parentWidget;
-}
-
-#endif
diff --git a/bibletime/frontend/ctooltipmanager.cpp b/bibletime/frontend/ctooltipmanager.cpp
deleted file mode 100644
index 94605aa..0000000
--- a/bibletime/frontend/ctooltipmanager.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/***************************************************************************
-                          ctooltipmanager.cpp  -  description
-                             -------------------
-    begin                : Sam Mai 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "ctooltipmanager.h"
-#include "frontend/cbtconfig.h"
-
-#include "backend/creferencemanager.h"
-#include "backend/cswordkey.h"
-#include "backend/centrydisplay.h"
-
-#include "util/scoped_resource.h"
-
-//KDE includes
-#include <klocale.h>
-
-CTooltipManager::CTooltipManager(){
-}
-
-CTooltipManager::~CTooltipManager(){
-}
-
-/** Returns the tooltip text for the given hyperlink. */
-const QString CTooltipManager::textForHyperlink( const QString& link ){
-  QString moduleName;
-  QString keyName;
-	CReferenceManager::Type type;
-
- 	CReferenceManager::decodeHyperlink(link, moduleName, keyName, type);
-  if (moduleName.isEmpty()) {
-    moduleName = CReferenceManager::preferredModule( type );
-  }
-
-//  qWarning("link was %s, key is %s", link.latin1(), keyName.latin1());
-  if (moduleName.isEmpty()) {
-    QString typeName = QString::null;
-    switch (type) {
-      case CReferenceManager::Bible:
-        typeName = i18n("Bible");
-        break;
-      case CReferenceManager::Commentary:
-        typeName = i18n("Commentary");
-        break;
-      case CReferenceManager::Lexicon:
-        typeName = i18n("Lexicon");
-        break;
-      case CReferenceManager::GenericBook:
-        typeName = i18n("Book");
-        break;
-  		case CReferenceManager::MorphHebrew:
-        typeName = i18n("Hebrew morphological lexicon");
-        break;
-  		case CReferenceManager::MorphGreek:
-        typeName = i18n("Greek morphological lexicon");
-        break;
-  		case CReferenceManager::StrongsHebrew:
-        typeName = i18n("Hebrew Strong's lexicon");
-        break;
-  		case CReferenceManager::StrongsGreek:
-        typeName = i18n("Greek Strong's lexicon");
-        break;
-  		default:
-        break;
-    }
-
-  	return QString::fromLatin1("<font color=\"red\"><center><b>%1</b></center></font><hr/>%2</font>")
-      .arg(i18n("Configuration problem!"))
-      .arg(i18n("Please make sure the default module for the type <font color=\"blue\"><i>%1</i></font> is properly configured in the options dialog.")
-          .arg(typeName)
-      );
-  };
-
-  if (CSwordModuleInfo* m = backend()->findModuleByName(moduleName)) { //found a default module for the type
-    return QString::fromLatin1("<head><style type=\"text/css\">%1</style></head><b>%1</b><hr/>%2")
-      .arg(tooltipCSS(m))
-      .arg(headingText(m, keyName))
-      .arg(moduleText(moduleName, keyName)
-    );
-  }
-  else {
-    return QString::fromLatin1("<font color=\"red\"><center><b>%1</b></center>%2</font><hr/>")
-            .arg(i18n("Configuration problem!"))
-            .arg(i18n("The module <FONT COLOR=\"blue\"><I>%1</I></FONT> was not found on your system. Install the module to make this tooltip work.")
-              .arg(moduleName)
-           );
-  }
-}
-
-/** Returns the tooltip text for the given hyperlink. */
-const QString CTooltipManager::textForReference( const QString& moduleName, const QString& keyName, const QString& description){
-	CSwordModuleInfo* const module = backend()->findModuleByName(moduleName);
-  return QString::fromLatin1("<head><style type=\"text/css\">%1</style></head><b>%1 %2</b>%3<hr/>%4")
-    .arg(tooltipCSS(module))
-  	.arg(i18n("Bookmark to"))
-  	.arg(headingText(module, keyName))
-   	.arg(!description.isEmpty() ? QString::fromLatin1("<br/><font color=\"#800000\">(%1)</font><br/>").arg(description.stripWhiteSpace()) : QString::null )
-    .arg(moduleText(moduleName, keyName));
-}
-
-
-/** Returns the text for the given moduleName and key name. */
-const QString CTooltipManager::moduleText( const QString& moduleName, const QString& keyName){
-  QString text = QString::null;
-  if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) {
-  	util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-  	key->key( keyName );
-
-    backend()->setFilterOptions( CBTConfig::getFilterOptionDefaults() );
-   	text = key->renderedText();
-
-		if (module->type() == CSwordModuleInfo::Bible || module->type() == CSwordModuleInfo::Commentary) {
-      text = QString::null;
-      sword::ListKey verses = sword::VerseKey().ParseVerseList((const char*)keyName.local8Bit(), "Genesis 1:1", true);
-			
-    	for (int i = 0; i < verses.Count(); ++i) {
-    		sword::VerseKey* element = dynamic_cast<sword::VerseKey*>(verses.GetElement(i));
-    		if (element && element->isBoundSet()) {
-     			sword::VerseKey lowerBound = element->LowerBound();
-          lowerBound.Headings(false);
-
-					sword::VerseKey upperBound = element->UpperBound();
-          upperBound.Headings(false);
-        	
-         	while (lowerBound < upperBound) {
-      			key->key( (const char*)lowerBound );
-		    		text += QString::fromLatin1("<b>%1:%2</b> %3<br/>")
-              .arg(lowerBound.Chapter())
-              .arg(lowerBound.Verse())
-              .arg(key->renderedText());
-						lowerBound++;
-          }
-          if (lowerBound == upperBound) {
-      			key->key( (const char*)lowerBound );
-		    		text += QString::fromLatin1("<b>%1:%2</b> %3<br/>")
-              .arg(lowerBound.Chapter())
-              .arg(lowerBound.Verse())
-              .arg(key->renderedText());
-          }
-				}
-    		else {
-	  			key->key( (const char*)(*verses.GetElement(i))  );
-					text += key->renderedText();
-        }
-    	}
-		}
-
-
-    const QFont font = CBTConfig::get(module->language()).second;
-    text = QString::fromLatin1("<div %1 style=\"font-family:%2; font-size:%3pt;\">")
-            .arg((module->textDirection() == CSwordModuleInfo::RightToLeft) ? "dir=\"rtl\"" : 0)
-            .arg(font.family())
-            .arg(font.pointSize())
-         + text + QString::fromLatin1("</div>");
-	}
- 	return text;
-}
-
-/** Returns the text for the tooltip beginning. */
-const QString CTooltipManager::headingText( CSwordModuleInfo* module, const QString& keyName ){
-  if (!module) {
-    return i18n("Module not set!");
-  }
-
-  const QString defaultEnding = QString::fromLatin1("  (<small>%1 \"%2\"</small>)").arg(i18n("Module")).arg(module->name());
-
-  if ((module->type() == CSwordModuleInfo::Bible) || (module->type() == CSwordModuleInfo::Commentary)) {
-    sword::ListKey keys = sword::VerseKey().ParseVerseList((const char*)keyName.local8Bit(), sword::VerseKey("Genesis 1:1"), true);
-
-    if (keys.Count() >= 1)
-      return QString::fromLocal8Bit(keys.GetElement(0)->getRangeText()) + defaultEnding;
-    else
-      return defaultEnding;
-  }
-  else { //non-versekeys are not localized  
-    util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-
-    key->key( keyName );
-    return key->key() + defaultEnding;
-  };
-  return QString::null;
-}
-
-/** Returns the CSS data used for the tooltips. */
-const QString CTooltipManager::tooltipCSS(CSwordModuleInfo* module){
-  CEntryDisplay* const display = module ? module->getDisplay() : 0;
-  if (!display)
-    return QString::null;
-
-  QString css = QString::null;
-  for (int i = CEntryDisplay::MinType; i <= CEntryDisplay::MaxType; ++i) {
-    CEntryDisplay::StyleType type = static_cast<CEntryDisplay::StyleType>(i);
-    if (type != CEntryDisplay::Body && type != CEntryDisplay::Background) {
-      css += display->cssString( type );
-    }
-  }
-  return css;
-}
diff --git a/bibletime/frontend/ctooltipmanager.h b/bibletime/frontend/ctooltipmanager.h
deleted file mode 100644
index a1b34b2..0000000
--- a/bibletime/frontend/ctooltipmanager.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/***************************************************************************
-                          ctooltipmanager.h  -  description
-                             -------------------
-    begin                : Sam Mai 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CTOOLTIPMANAGER_H
-#define CTOOLTIPMANAGER_H
-
-//BibleTime includes
-#include "backend/cswordmoduleinfo.h"
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qstring.h>
-
-/** Manages the tooltip texts for hyperlinks ad refereences.
-  * @author The BibleTime team
-  */
-class CTooltipManager : public CPointers {
-public: 
-  /**
-  * Returns the tooltip text for the given hyperlink.
-  */
-  static const QString textForHyperlink( const QString& link );
-	static const QString textForReference( const QString& moduleName, const QString& keyName, const QString& description);
-
-protected: // Protected methods
-  /**
-  * Returns the text for the tooltip beginning.
-  */
-  static const QString headingText(CSwordModuleInfo* const module, const QString& keyName);
-  /**
-  * Returns the text for the given moduleName and key name.
-  */
-  static const QString moduleText( const QString& moduleName, const QString& keyName);
-  /**
-  * Returns the CSS data used for the tooltips. The difference to the display CSS data is
-  * that the backgroundcolors etc. are not used.
-  */
-  static const QString tooltipCSS(CSwordModuleInfo* module);
-
-private:
-	CTooltipManager();
-	~CTooltipManager();
-};
-
-#endif
diff --git a/bibletime/frontend/display/Makefile.am b/bibletime/frontend/display/Makefile.am
deleted file mode 100644
index 7a79921..0000000
--- a/bibletime/frontend/display/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-INCLUDES = $(all_includes)
-
-libdisplay_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libdisplay.a
-
-libdisplay_a_SOURCES = \
-cdisplay.cpp \
-creaddisplay.cpp \
-chtmlreaddisplay.cpp \
-cwritedisplay.cpp \
-cplainwritedisplay.cpp \
-chtmlwritedisplay.cpp
-
-all_headers = \
-cdisplay.h \
-creaddisplay.h \
-chtmlreaddisplay.h \
-cwritedisplay.h \
-cplainwritedisplay.h \
-chtmlwritedisplay.h
-
-EXTRA_DIST = $(libdisplay_a_SOURCES) $(all_headers)
-
diff --git a/bibletime/frontend/display/Makefile.in b/bibletime/frontend/display/Makefile.in
deleted file mode 100644
index 5e06d71..0000000
--- a/bibletime/frontend/display/Makefile.in
+++ /dev/null
@@ -1,729 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-
-#>- libdisplay_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libdisplay.a
-
-libdisplay_a_SOURCES = \
-cdisplay.cpp \
-creaddisplay.cpp \
-chtmlreaddisplay.cpp \
-cwritedisplay.cpp \
-cplainwritedisplay.cpp \
-chtmlwritedisplay.cpp
-
-
-all_headers = \
-cdisplay.h \
-creaddisplay.h \
-chtmlreaddisplay.h \
-cwritedisplay.h \
-cplainwritedisplay.h \
-chtmlwritedisplay.h
-
-
-EXTRA_DIST = $(libdisplay_a_SOURCES) $(all_headers)
-subdir = bibletime/frontend/display
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libdisplay_a_AR = $(AR) cru
-libdisplay_a_LIBADD =
-am_libdisplay_a_OBJECTS = cdisplay.$(OBJEXT) creaddisplay.$(OBJEXT) \
-	chtmlreaddisplay.$(OBJEXT) cwritedisplay.$(OBJEXT) \
-	cplainwritedisplay.$(OBJEXT) chtmlwritedisplay.$(OBJEXT)
-#>- libdisplay_a_OBJECTS = $(am_libdisplay_a_OBJECTS)
-#>+ 7
-libdisplay_a_final_OBJECTS = libdisplay_a.all_cpp.o 
-libdisplay_a_nofinal_OBJECTS = cdisplay.$(OBJEXT) creaddisplay.$(OBJEXT) \
-	chtmlreaddisplay.$(OBJEXT) cwritedisplay.$(OBJEXT) \
-	cplainwritedisplay.$(OBJEXT) chtmlwritedisplay.$(OBJEXT)\
-chtmlreaddisplay.moc.o chtmlwritedisplay.moc.o cdisplay.moc.o 
-@KDE_USE_FINAL_FALSE@libdisplay_a_OBJECTS = $(libdisplay_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libdisplay_a_OBJECTS = $(libdisplay_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cdisplay.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/chtmlreaddisplay.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/chtmlwritedisplay.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cplainwritedisplay.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/creaddisplay.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cwritedisplay.Po
-#>+ 12
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/chtmlreaddisplay.moc.P $(DEPDIR)/chtmlwritedisplay.moc.P $(DEPDIR)/cdisplay.moc.P  $(DEPDIR)/libdisplay_a.all_cpp.P ./$(DEPDIR)/cdisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/chtmlreaddisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/chtmlwritedisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cplainwritedisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/creaddisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cwritedisplay.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/chtmlreaddisplay.moc.P $(DEPDIR)/chtmlwritedisplay.moc.P $(DEPDIR)/cdisplay.moc.P ./$(DEPDIR)/cdisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/chtmlreaddisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/chtmlwritedisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cplainwritedisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/creaddisplay.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cwritedisplay.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libdisplay_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libdisplay_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/frontend/display/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/display/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/display/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libdisplay.a: $(libdisplay_a_OBJECTS) $(libdisplay_a_DEPENDENCIES) 
-	-rm -f libdisplay.a
-	$(libdisplay_a_AR) libdisplay.a $(libdisplay_a_OBJECTS) $(libdisplay_a_LIBADD)
-	$(RANLIB) libdisplay.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdisplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chtmlreaddisplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chtmlwritedisplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cplainwritedisplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creaddisplay.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cwritedisplay.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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:  $(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 "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-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
-
-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-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-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.
-.NOEXPORT:
-
-#>+ 3
-chtmlreaddisplay.moc.cpp: $(srcdir)/chtmlreaddisplay.h
-	$(MOC) $(srcdir)/chtmlreaddisplay.h -o chtmlreaddisplay.moc.cpp
-
-#>+ 2
-mocs: chtmlreaddisplay.moc.cpp
-
-#>+ 3
-chtmlwritedisplay.moc.cpp: $(srcdir)/chtmlwritedisplay.h
-	$(MOC) $(srcdir)/chtmlwritedisplay.h -o chtmlwritedisplay.moc.cpp
-
-#>+ 2
-mocs: chtmlwritedisplay.moc.cpp
-
-#>+ 3
-cdisplay.moc.cpp: $(srcdir)/cdisplay.h
-	$(MOC) $(srcdir)/cdisplay.h -o cdisplay.moc.cpp
-
-#>+ 2
-mocs: cdisplay.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  chtmlreaddisplay.moc.cpp chtmlwritedisplay.moc.cpp cdisplay.moc.cpp
-
-#>+ 2
-KDE_DIST=cplainwritedisplay.h cwritedisplay.h cdisplay.h chtmlwritedisplay.h chtmlreaddisplay.h creaddisplay.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/display/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/display/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libdisplay_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cdisplay.cpp $(srcdir)/creaddisplay.cpp $(srcdir)/chtmlreaddisplay.cpp $(srcdir)/cwritedisplay.cpp $(srcdir)/cplainwritedisplay.cpp $(srcdir)/chtmlwritedisplay.cpp chtmlreaddisplay.moc.cpp cdisplay.moc.cpp chtmlwritedisplay.moc.cpp 
-	@echo 'creating libdisplay_a.all_cpp.cpp ...'; \
-	rm -f libdisplay_a.all_cpp.files libdisplay_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libdisplay_a.all_cpp.final; \
-	for file in cdisplay.cpp creaddisplay.cpp chtmlreaddisplay.cpp cwritedisplay.cpp cplainwritedisplay.cpp chtmlwritedisplay.cpp chtmlreaddisplay.moc.cpp cdisplay.moc.cpp chtmlwritedisplay.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libdisplay_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdisplay_a.all_cpp.final; \
-	done; \
-	cat libdisplay_a.all_cpp.final libdisplay_a.all_cpp.files > libdisplay_a.all_cpp.cpp; \
-	rm -f libdisplay_a.all_cpp.final libdisplay_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libdisplay_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libdisplay_a_OBJECTS="$(libdisplay_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libdisplay_a_OBJECTS="$(libdisplay_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libdisplay_a_OBJECTS="$(libdisplay_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libdisplay_a_OBJECTS="$(libdisplay_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/frontend/display/cdisplay.cpp b/bibletime/frontend/display/cdisplay.cpp
deleted file mode 100644
index 5fe8f4e..0000000
--- a/bibletime/frontend/display/cdisplay.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-/***************************************************************************
-                          cdisplay.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cdisplay.h"
-#include "chtmlreaddisplay.h"
-#include "cplainwritedisplay.h"
-#include "chtmlwritedisplay.h"
-
-#include "backend/creferencemanager.h"
-
-#include "util/ctoolclass.h"
-
-
-//Qt includes
-#include <qclipboard.h>
-#include <qpopupmenu.h>
-#include <qtimer.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <kfiledialog.h>
-#include <klocale.h>
-
-
-CDisplayConnections::CDisplayConnections( CDisplay* display ) : m_display(display) {
-}
-
-void CDisplayConnections::selectAll() {
-	m_display->selectAll();
-}
-
-void CDisplayConnections::saveAsHTML() {
-	m_display->save(CDisplay::HTMLText, CDisplay::Document);
-}
-
-void CDisplayConnections::saveAsPlain() {
-	m_display->save(CDisplay::PlainText, CDisplay::Document);
-}
-
-/** Emits the signal. */
-void CDisplayConnections::emitReferenceClicked( const QString& module, const QString& key){
-	emit referenceClicked( module, key );
-}
-
-/** Emits the signal. */
-void CDisplayConnections::emitReferenceDropped( const QString& key){
- 	emit referenceDropped(key);
-}
-
-/** Emits the signal. */
-void CDisplayConnections::emitTextChanged(){
- 	emit textChanged();
-}
-
-/** No descriptions */
-void CDisplayConnections::copyAll(){
-	m_display->copy(CDisplay::PlainText, CDisplay::Document);
-}
-
-/** No descriptions */
-void CDisplayConnections::copySelection(){
-	m_display->copy(CDisplay::PlainText, CDisplay::SelectedText);
-}
-
-void CDisplayConnections::printAll() {
-	m_display->print(CDisplay::Document);
-}
-
-void CDisplayConnections::printAnchorWithText() {
-	m_display->print(CDisplay::AnchorWithText);
-}
-
-void CDisplayConnections::copyAnchorOnly(){
-	m_display->copy(CDisplay::PlainText, CDisplay::AnchorOnly);
-}
-
-void CDisplayConnections::copyAnchorTextOnly(){
-	m_display->copy(CDisplay::PlainText, CDisplay::AnchorTextOnly);
-}
-
-void CDisplayConnections::copyAnchorWithText(){
-	m_display->copy(CDisplay::PlainText, CDisplay::AnchorWithText);
-}
-
-void CDisplayConnections::saveAnchorWithText(){
-	m_display->save(CDisplay::PlainText, CDisplay::AnchorWithText);
-}
-
-void CDisplayConnections::clear(){
-  m_display->setText(QString::null);
-}
-
-/*----------------------*/
-
-CReadDisplay* CDisplay::createReadInstance( CReadWindow* readWindow, QWidget* parent ) {
-  return new CHTMLReadDisplay(readWindow, parent);
-}
-
-CWriteDisplay* CDisplay::createWriteInstance( CWriteWindow* writeWindow, const CWriteDisplay::WriteDisplayType& type, QWidget* parent ) {
-//  qWarning("CDisplay::createWriteInstance");
-  if (type == PlainTextDisplay) {
-    return new CPlainWriteDisplay(writeWindow, parent);
-  }
-  else {
-    return new CHTMLWriteDisplay(writeWindow, parent);
-  };
-}
-
-
-CDisplay::CDisplay(CDisplayWindow* parent) :
-  m_parentWindow(parent),
-  m_connections( new CDisplayConnections( this ) ),
-  m_popup(0)
-{
-}
-
-CDisplay::~CDisplay(){
-  delete m_connections;
-}
-
-const bool CDisplay::copy( const CDisplay::TextType format, const CDisplay::TextPart part  ) {
-  const QString content = text(format, part);
-
-  QClipboard* cb = KApplication::clipboard();
-  cb->setText(content);
-  return true;
-}
-
-const bool CDisplay::save( const CDisplay::TextType format, const CDisplay::TextPart part ) {
-//  qWarning("CDisplay::save( const CDisplay::TextType format, const CDisplay::TextPart part  )");
-  const QString content = text(format, part);
-  QString filter = QString::null;
-
-  switch (format) {
-    case HTMLText:
-      filter = QString::fromLatin1("*.html *.htm | ") + i18n("HTML files") + QString::fromLatin1("\n *.* | All files (*.*)");
-      break;
-    case PlainText:
-      filter = QString::fromLatin1("*.txt | ") + i18n("Text files") + QString::fromLatin1("\n *.* | All files (*.*)");
-      break;
-  };
-
-  const QString filename = KFileDialog::getSaveFileName(QString::null, filter, 0, i18n("Save document ..."));
-  if (!filename.isEmpty()) {
-    CToolClass::savePlainFile(filename, content);
-  }
-  return true;
-}
-
-/** Emits the signal which used when a reference was clicked. */
-void CDisplay::emitReferenceClicked( const QString& reference ){
-  QString module;
-  QString key;
-  CReferenceManager::Type type;
-  /*const bool ok = */ CReferenceManager::decodeHyperlink(reference, module, key, type);
-  if (module.isEmpty()) {
-    module = CReferenceManager::preferredModule( type );
-  }
-  m_connections->emitReferenceClicked(module, key);
-}
-
-/** Used when a reference was dropped onto the widget. */
-void CDisplay::emitReferenceDropped( const QString& reference ){
-  QString module;
-  QString key;
-  CReferenceManager::Type type;
-  /*const bool ok = */ CReferenceManager::decodeHyperlink(reference, module, key, type);
-//  if (module.isEmpty()) {
-//    module = CReferenceManager::preferredModule( type );
-//  }
-
-  m_connections->emitReferenceDropped(key);
-}
-
-/** Returns the connections obect used for signas and slots. */
-CDisplayConnections* const CDisplay::connectionsProxy() const{
-	return m_connections;
-}
-
-CDisplayWindow* const CDisplay::parentWindow() const {
- 	return m_parentWindow;
-}
-
-/** Installs the popup which should be opened when the right mouse button was pressed. */
-void CDisplay::installPopup( QPopupMenu* popup ){
-  m_popup = popup;
-}
-
-/** Returns the popup menu which was set by installPopupMenu() */
-QPopupMenu* const CDisplay::installedPopup(){
-  Q_ASSERT(m_popup);
-	return m_popup;
-}
diff --git a/bibletime/frontend/display/cdisplay.h b/bibletime/frontend/display/cdisplay.h
deleted file mode 100644
index 4394ea6..0000000
--- a/bibletime/frontend/display/cdisplay.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/***************************************************************************
-                          cdisplay.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CDISPLAY_H
-#define CDISPLAY_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qobject.h>
-#include <qstring.h>
-
-
-class CDisplayConnections;
-class CReadWindow;
-class CWriteWindow;
-
-class CDisplayWindow;
-class CReadDisplay;
-class CWriteDisplay;
-
-
-class QPopupMenu;
-
-/** The base class for all display widgets.
-  * @author The BibleTime team
-  */
-class CDisplay : public CPointers {
-public:
-  enum WriteDisplayType {
-    HTMLDisplay = 0,
-    PlainTextDisplay
-  };
-
-	static CReadDisplay* createReadInstance(CReadWindow* readWindow, QWidget* parent = 0);
-	static CWriteDisplay* createWriteInstance( CWriteWindow* writeWindow, const WriteDisplayType& type = PlainTextDisplay, QWidget* parent = 0 );
-
-  enum TextType {
-    HTMLText, /* Used for HTML markup */
-    PlainText /* Plain text without links etc. */
-  };
-  enum TextPart {
-    Document, /* All text */
-    SelectedText, /* Only the selected text */
-    AnchorOnly,
-    AnchorTextOnly,
-    AnchorWithText
-  };
-
-  /**
-  * Copies the given text with the specified format into the applications clipboard.
-  */
-  virtual const bool copy( const CDisplay::TextType format, const CDisplay::TextPart part );
-  /**
-  * Saves the given text with the specified format into the applications clipboard.
-  */
-  virtual const bool save( const CDisplay::TextType format, const CDisplay::TextPart part );
-
-  //the pure virtual methods of this base class
-
-  /** Returns the text in the given format.
-  *
-  */
-  virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document ) = 0;
-  /**
-  * Sets the new text for this display widget.
-  */
-  virtual void setText( const QString& newText ) = 0;
-  /**
-  * Returns true if the display widget has a selection. Otherwise false.
-  */
-  virtual const bool hasSelection() = 0;
-  /**
-  * Returns the view of this display widget.
-  */
-  virtual QWidget* view() = 0;
-  /**
-	*	 Selects the document text.
-	*/
-  virtual void selectAll() = 0;
-  /**
-  * Returns the connections obect used for signas and slots.
-  */
-  virtual CDisplayConnections* const connectionsProxy() const;
-  /**
-  * Returns the parent window used for this display widget.
-  */
-  CDisplayWindow* const parentWindow() const;
-  virtual void print( const CDisplay::TextPart ) = 0;
-  /**
-  * Installs the popup which should be opened when the right mouse button was pressed.
-  */
-  void installPopup( QPopupMenu* popup );
-  /**
-  * Returns the popup menu which was set by installPopupMenu()
-  */
-  QPopupMenu* const installedPopup();
-
-protected:
-  /**
-  * Used when a reference was dropped onto the widget.
-  */
-  void emitReferenceDropped( const QString& reference );
-  /**
-  * Emits the signal which used when a reference was clicked.
-  */
-  void emitReferenceClicked( const QString& reference );
-
-protected:
-	CDisplay(CDisplayWindow* parent);
-	virtual ~CDisplay();
-
-private:
- 	CDisplayWindow* m_parentWindow;
-	CDisplayConnections* m_connections;
-  QPopupMenu* m_popup;  
-};
-
-class CDisplayConnections : public QObject {
-	Q_OBJECT
-public:	
-	CDisplayConnections( CDisplay* parent );
-
-public slots:
-  virtual void selectAll();
-	void emitReferenceClicked( const QString& module, const QString& key);
-	void emitReferenceDropped( const QString& key );
-	void emitTextChanged();
-
-  //stuff which works in every CDisplay
-  void saveAsPlain();
-  void saveAsHTML();
-  void saveAnchorWithText();
-
-  void printAll();
-  void printAnchorWithText();
-
-  void copySelection();
-  void copyAll();
-  void copyAnchorWithText();
-  void copyAnchorTextOnly();
-  void copyAnchorOnly();
-
-  void clear();
-
-signals:
-  void referenceClicked(const QString& module, const QString& key);
-  void referenceDropped(const QString& key);
-  void textChanged();
-
-private:
-  CDisplay* m_display;
-
-	struct {
-		QString module;
-		QString key;
-	} m_referenceClickedCache;
-};
-
-#endif
diff --git a/bibletime/frontend/display/chtmlreaddisplay.cpp b/bibletime/frontend/display/chtmlreaddisplay.cpp
deleted file mode 100644
index 7241f3a..0000000
--- a/bibletime/frontend/display/chtmlreaddisplay.cpp
+++ /dev/null
@@ -1,363 +0,0 @@
-/***************************************************************************
-                          chtmlreaddisplay.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "chtmlreaddisplay.h"
-
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/creadwindow.h"
-#include "backend/creferencemanager.h"
-#include "backend/cswordkey.h"
-
-#include "util/ctoolclass.h"
-
-#include "frontend/cbtconfig.h"
-#include "frontend/ctooltipmanager.h"
-#include "frontend/cdragdropmgr.h"
-
-#include "util/scoped_resource.h"
-
-//Qt includes
-#include <qcursor.h>
-#include <qscrollview.h>
-#include <qwidget.h>
-#include <qdragobject.h>
-#include <qpopupmenu.h>
-#include <qlayout.h>
-#include <qtimer.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <khtmlview.h>
-#include <kglobalsettings.h>
-#include <khtml_events.h>
-
-#include <dom/dom2_range.h>
-#include <dom/html_element.h>
-#include <dom/dom2_traversal.h>
-
-CHTMLReadDisplay::CHTMLReadDisplay(CReadWindow* readWindow, QWidget* parentWidget) : KHTMLPart((m_view = new CHTMLReadDisplayView(this, parentWidget ? parentWidget : readWindow)), readWindow ? readWindow : parentWidget), CReadDisplay(readWindow) {
-  setDNDEnabled(false);
-  m_view->setDragAutoScroll(false);
-}
-
-CHTMLReadDisplay::~CHTMLReadDisplay(){
-}
-
-const QString CHTMLReadDisplay::text( const CDisplay::TextType format, const CDisplay::TextPart part) {
-  switch (part) {
-    case Document: {
-      if (format == HTMLText)
-        return document().toHTML();
-      else {
-        return htmlDocument().body().innerText().string().latin1();
-      }
-		}
-
-    case SelectedText: {
-			if (!hasSelection())
-   			return QString::null;
-
-      if (!hasSelection()) {
-      	return QString::null;
-      }
-      else if (format == HTMLText) {
-        DOM::Range range = selection();
-        return range.toHTML().string();
-      }
-      else { //plain text requested
-        return selectedText();
-      }
-		}
-
-  	case AnchorOnly: {
-			QString moduleName;
-   		QString keyName;
-     	CReferenceManager::Type type;
-      CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type);
-      
-     	return keyName;
-    }
-
-		case AnchorTextOnly: {
-			QString moduleName;
-   		QString keyName;
-     	CReferenceManager::Type type;
-      CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type);
-
-      if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) {
-				util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-    		key->key( keyName );
-
-      	return key->strippedText();
-   		}
-     	return QString::null;
-    }
-
-    case AnchorWithText: {
-			QString moduleName;
-   		QString keyName;
-     	CReferenceManager::Type type;
-      CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type);
-
-      if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) {
-				util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-    		key->key( keyName );
-
-      	return QString::fromLatin1("%1\n(%2, %3)")
-          .arg(key->strippedText())
-          .arg(key->key())
-          .arg(key->module()->name());
-   		}
-     	return QString::null;
-    }
-    default:
-      return QString::null;
-  }
-}
-
-void CHTMLReadDisplay::setText( const QString& newText ) {
-  begin();
-  write(newText);
-  end();
-}
-
-/** No descriptions */
-const bool CHTMLReadDisplay::hasSelection(){
-  return KHTMLPart::hasSelection();
-}
-
-
-/** Reimplementation. */
-QScrollView* CHTMLReadDisplay::view(){
-  return KHTMLPart::view();
-}
-
-void CHTMLReadDisplay::selectAll() {
-  KHTMLPart::selectAll();
-}
-
-/** No descriptions */
-void CHTMLReadDisplay::moveToAnchor( const QString& anchor ){
-	gotoAnchor(anchor);
-}
-
-void CHTMLReadDisplay::urlSelected( const QString& url, int button, int state, const QString& _target, KParts::URLArgs args){
-  KHTMLPart::urlSelected(url, button, state, _target, args);
-  m_urlWorkaroundData.doWorkaround = false;
-
-  if (!url.isEmpty() && CReferenceManager::isHyperlink(url)) {
-    QString module;
-    QString key;
-    CReferenceManager::Type type;
-    CReferenceManager::decodeHyperlink(url, module, key, type);
-    if (module.isEmpty()) {
-      module = CReferenceManager::preferredModule( type );
-		}
-
-    // we have to use this workaround, otherwise the widget would scroll because it was interrupted
-    // between mouseClick and mouseRelease (I guess)
-    m_urlWorkaroundData.doWorkaround = true;
-    m_urlWorkaroundData.url = url;
-    m_urlWorkaroundData.state =  state;
-		m_urlWorkaroundData.button = button;
-		m_urlWorkaroundData.target = _target;
-		m_urlWorkaroundData.args = args;
-		m_urlWorkaroundData.module = module;
-		m_urlWorkaroundData.key = key;
-  }
-  else if (!url.isEmpty() && url.left(1) == "#") { //anchor
-    moveToAnchor(url.mid(1));
-  }
-}
-
-/** Reimplementation. */
-void CHTMLReadDisplay::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent* event ){
-  KHTMLPart::khtmlMouseReleaseEvent(event);
-
-  m_dndData.mousePressed = false;
-  m_dndData.isDragging = false;
-  m_dndData.node = DOM::Node();
-  m_dndData.anchor = DOM::DOMString();
-
-  if (m_urlWorkaroundData.doWorkaround) {
-    m_urlWorkaroundData.doWorkaround = false;
-    connectionsProxy()->emitReferenceClicked(m_urlWorkaroundData.module, m_urlWorkaroundData.key);
-  }
-}
-
-void CHTMLReadDisplay::khtmlMousePressEvent( khtml::MousePressEvent* event ){
-  m_dndData.node = DOM::Node();
-  m_dndData.anchor = DOM::DOMString();
-  m_dndData.mousePressed = false;
-  m_dndData.isDragging = false;
-
-  if (event->qmouseEvent()->button() == Qt::RightButton) {
-    setActiveAnchor( event->url().string() );
-  }
-  else if (event->qmouseEvent()->button() == Qt::LeftButton) {
-    m_dndData.node = event->innerNode();
-    m_dndData.anchor = event->url();
-    m_dndData.mousePressed = true;
-    m_dndData.isDragging = false;
-    m_dndData.startPos = QPoint(event->x(), event->y());
-    m_dndData.selection = selectedText();
-
-    if (!m_dndData.node.isNull()) { //we drag a valid link
-      m_dndData.dragType = DNDData::Link;
-    }
-  }
-
-  KHTMLPart::khtmlMousePressEvent(event);
-}
-
-/** Reimplementation for our drag&drop system. */
-void CHTMLReadDisplay::khtmlMouseMoveEvent( khtml::MouseMoveEvent* e ){
-  if( !(e->qmouseEvent()->state() & LeftButton)) { //left mouse button not pressed
-    KHTMLPart::khtmlMouseMoveEvent(e);
-    return;
-  }
-
-  const int delay = KGlobalSettings::dndEventDelay();
-  QPoint newPos = QPoint(e->x(), e->y());
-
-  if ( (newPos.x() > m_dndData.startPos.x()+delay || newPos.x() < (m_dndData.startPos.x()-delay) ||
-       newPos.y() > m_dndData.startPos.y()+delay || newPos.y() < (m_dndData.startPos.y()-delay)) &&
-       !m_dndData.isDragging && m_dndData.mousePressed  )
-  {
-    QDragObject* d = 0;
-    if (!m_dndData.anchor.isEmpty() && m_dndData.dragType == DNDData::Link && !m_dndData.node.isNull() ) {
-    // create a new bookmark drag!
-      QString module = QString::null;
-    	QString key = QString::null;
-    	CReferenceManager::Type type;
-    	if ( !CReferenceManager::decodeHyperlink(m_dndData.anchor.string(), module, key, type) )
-    		return;
-      
-      CDragDropMgr::ItemList dndItems;
-      dndItems.append( CDragDropMgr::Item(module, key, QString::null) ); //no description!
-      d = CDragDropMgr::dragObject(dndItems, KHTMLPart::view()->viewport());
-    }
-    else if (m_dndData.dragType == DNDData::Text && !m_dndData.selection.isEmpty()) {    // create a new plain text drag!
-      CDragDropMgr::ItemList dndItems;
-      dndItems.append( CDragDropMgr::Item(m_dndData.selection) ); //no description!
-      d = CDragDropMgr::dragObject(dndItems, KHTMLPart::view()->viewport());
-    }
-
-    if (d) {
-      m_dndData.isDragging = true;
-      m_dndData.mousePressed = false;
-
-      //first make a virtual mouse click to end the selection, it it's in progress
-      QMouseEvent e(QEvent::MouseButtonRelease, QPoint(0,0), Qt::LeftButton, Qt::LeftButton);
-      KApplication::sendEvent(view()->viewport(), &e);
-      d->drag();
-    }
-  }
-
-  KHTMLPart::khtmlMouseMoveEvent(e);
-}
-/* -------------------------- */
-CHTMLReadDisplayView::ToolTip::ToolTip(CHTMLReadDisplayView* view) : CToolTip(view), m_view( view ) {
-};
-
-/** Decides whether a tooltip should be shown. */
-void CHTMLReadDisplayView::ToolTip::maybeTip( const QPoint& /*p*/ ){
-//  qWarning("CHTMLReadDisplayView::ToolTip::maybeTip( const QPoint& p )");
-  DOM::Node node = m_view->part()->nodeUnderMouse();
-  if (node.isNull())
-  	return;
-
-  DOM::Node linkNode = node;
-  do {
-    if (!linkNode.isNull() && linkNode.nodeName().string().upper() == "A" ) { //found right node
-      if (linkNode.hasAttributes()) {
-        QString link = QString::null;
-        DOM::NamedNodeMap attributes = linkNode.attributes();
-        for (unsigned int i = 0; i < attributes.length(); i++) {
-          if (attributes.item(i).nodeName().string().upper() == "HREF") {
-            link = attributes.item(i).nodeValue().string();
-            break;
-          }
-        }
-
-        const QString tooltipText = CTooltipManager::textForHyperlink( link );
-        if (!tooltipText.isEmpty()) {
-          QRect rect = linkNode.getRect();
-          rect.setX( m_view->mapFromGlobal(QCursor::pos()).x() );
-          rect.setY( m_view->mapFromGlobal(QCursor::pos()).y() );
-	        tip( m_view->mapFromGlobal(QCursor::pos()), rect, tooltipText );
-        }
-        break;
-      }
-    }
-  } while ( !(linkNode = linkNode.parentNode()).isNull() );
-}
-
-// ---------------------
-
-CHTMLReadDisplayView::CHTMLReadDisplayView(CHTMLReadDisplay* displayWidget, QWidget* parent) : KHTMLView(displayWidget, parent), m_display(displayWidget) {
-  viewport()->setAcceptDrops(true);
-  setMarginWidth(4);
-  setMarginHeight(4);
-};
-
-
-/** Opens the popupmenu at the given position. */
-void CHTMLReadDisplayView::popupMenu( const QString& url, const QPoint& pos){
- 	if (!url.isEmpty()) {
-//    qWarning(url.latin1());
-  	m_display->setActiveAnchor(url);
-	}
- 	if (QPopupMenu* popup = m_display->installedPopup()) {
-	 	popup->exec(pos);
-  }
-}
-
-/** Reimplementation from QScrollView. Sets the right slots */
-void CHTMLReadDisplayView::polish(){
-  KHTMLView::polish();
-  connect( part(), SIGNAL(popupMenu(const QString&, const QPoint&)),
-    this, SLOT(popupMenu(const QString&, const QPoint&)));
-
-  (void)new ToolTip(this);
-}
-
-/** Reimplementatiob from QScrollView. */
-void CHTMLReadDisplayView::contentsDropEvent( QDropEvent* e ){
-  if (CDragDropMgr::canDecode(e) && CDragDropMgr::dndType(e) == CDragDropMgr::Item::Bookmark) {
-    CDragDropMgr::ItemList dndItems = CDragDropMgr::decode(e);
-    CDragDropMgr::Item item = dndItems.first();  
-    e->acceptAction();
-    m_display->connectionsProxy()->emitReferenceDropped(item.bookmarkKey());
-    return;
-  };
-
-  //don't accept the action!
-  e->acceptAction(false);
-  e->ignore();
-}
-
-/** Reimplementation from QScrollView. */
-void CHTMLReadDisplayView::contentsDragEnterEvent( QDragEnterEvent* e ){
-  if (CDragDropMgr::canDecode(e) && CDragDropMgr::dndType(e) == CDragDropMgr::Item::Bookmark) {
-    e->acceptAction();
-    return;
-  }
-  e->acceptAction(false);
-  e->ignore();
-}
-
diff --git a/bibletime/frontend/display/chtmlreaddisplay.h b/bibletime/frontend/display/chtmlreaddisplay.h
deleted file mode 100644
index 2159e2c..0000000
--- a/bibletime/frontend/display/chtmlreaddisplay.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/***************************************************************************
-                          chtmlreaddisplay.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CHTMLREADDISPLAY_H
-#define CHTMLREADDISPLAY_H
-
-//BibleTime includes
-#include "creaddisplay.h"
-#include "frontend/ctooltip.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qwidget.h>
-
-//KDE includes
-#include <khtml_part.h>
-#include <khtmlview.h>
-#include <kparts/browserextension.h>
-
-class CHTMLReadDisplayView;
-
-/** The implementation for the HTML read display.
-  * @author The BibleTime team
-  */
-class CHTMLReadDisplay : public KHTMLPart, public CReadDisplay {
-  Q_OBJECT
-public:
-  //reimplemented functions from CDisplay
-  /**
-  * Returns the right text part in the specified format.
-  */
-  virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document );
-  /**
-  * Sets the new text for this display widget.
-  */
-  virtual void setText( const QString& newText );
-  virtual const bool hasSelection();
-  /**
-  * Reimplementation.
-  */
-  virtual QScrollView* view();
-  virtual void selectAll();
-  virtual void moveToAnchor( const QString& anchor );
-
-protected:
-	friend class CDisplay;
- 	CHTMLReadDisplay( CReadWindow* readWindow, QWidget* parent = 0 );
-	virtual ~CHTMLReadDisplay();
-
-	virtual void urlSelected( const QString& url, int button, int state, const QString& _target, KParts::URLArgs args);
-  /**
-  * Reimplementation.
-  */
-  virtual void khtmlMouseReleaseEvent( khtml::MouseReleaseEvent* event );
-	virtual void khtmlMousePressEvent( khtml::MousePressEvent* event );
-	virtual void khtmlMouseMoveEvent( khtml::MouseMoveEvent* e );
-
- 	struct DNDData {
-  	bool mousePressed;
-   	bool isDragging;
-    DOM::Node node;
-    DOM::DOMString anchor;
-    QString selection;
-    QPoint startPos;
-    enum DragType {
-			Link,
-      Text
-    } dragType;
- 	} m_dndData;
-
-private:
-	CHTMLReadDisplayView* m_view;	
- 	struct URLWorkaroundData {
-    bool doWorkaround;
-    QString url;
-    int button;
-    int state;
-    QString target;
-    KParts::URLArgs args;
-
-    QString module;
-    QString key;
- 	} m_urlWorkaroundData;
-};
-
-class CHTMLReadDisplayView : public KHTMLView, public CPointers {
-  Q_OBJECT
-protected: // Protected methods
-	friend class CHTMLReadDisplay;
-
-  class ToolTip : public CToolTip {
-  public:
-    ToolTip(CHTMLReadDisplayView* parent);
-  protected: // Protected methods
-    /**
-    * Decides whether a tooltip should be shown.
-    */
-    virtual void maybeTip( const QPoint& );
-  private:
-    CHTMLReadDisplayView* m_view;
-  };
-
-  CHTMLReadDisplayView(CHTMLReadDisplay* display, QWidget* parent);
-  /**
-  * Reimplementation from QScrollView. Sets the right slots
-  */
-  virtual void polish();
-  /**
-  * Reimplementatiob from QScrollView.
-  */
-  virtual void contentsDropEvent( QDropEvent* );
-  /**
-  * Reimplementatiob from QScrollView.
-  */
-  virtual void contentsDragEnterEvent( QDragEnterEvent* );
-
-protected slots: // Protected slots
-  /**
-  * Opens the popupmenu at the given position.
-  */
-  void popupMenu( const QString&, const QPoint& );
-
-private:
-  CHTMLReadDisplay* m_display;
-};
-
-#endif
diff --git a/bibletime/frontend/display/chtmlwritedisplay.cpp b/bibletime/frontend/display/chtmlwritedisplay.cpp
deleted file mode 100644
index 2f21112..0000000
--- a/bibletime/frontend/display/chtmlwritedisplay.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/***************************************************************************
-                          chtmlwritedisplay.cpp  -  description
-                             -------------------
-    begin                : Fre Nov 29 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "chtmlwritedisplay.h"
-
-#include "frontend/displaywindow/cwritewindow.h"
-
-#include "util/cresmgr.h"
-
-//Qt includes
-#include <qpopupmenu.h>
-#include <qtooltip.h>
-#include <qwhatsthis.h>
-
-//KDE includes
-#include <kaction.h>
-#include <ktoolbar.h>
-#include <klocale.h>
-#include <kfontcombo.h>
-#include <kcolorbutton.h>
-#include <kpopupmenu.h>
-
-CHTMLWriteDisplay::CHTMLWriteDisplay(CWriteWindow* parentWindow, QWidget* parent)
-  : CPlainWriteDisplay(parentWindow,parent)
-{
-  m_actions.bold = 0;
-  m_actions.italic = 0;
-  m_actions.underline = 0;
-  
-  m_actions.selectAll = 0;
-  
-  setTextFormat(Qt::RichText);
-  setAcceptDrops(true);
-  viewport()->setAcceptDrops(true);
-
-}
-
-CHTMLWriteDisplay::~CHTMLWriteDisplay(){
-}
-
-const QString CHTMLWriteDisplay::plainText() {
-  return QTextEdit::text();
-};
-
-void CHTMLWriteDisplay::toggleBold() {
-  setBold( m_actions.bold->isChecked() );
-};
-
-void CHTMLWriteDisplay::toggleItalic() {
-  setItalic( m_actions.italic->isChecked() );
-};
-
-void CHTMLWriteDisplay::toggleUnderline() {
-  setUnderline( m_actions.underline->isChecked() );
-};
-
-
-void CHTMLWriteDisplay::alignLeft() {
-  setAlignment(Qt::AlignLeft);
-};
-
-void CHTMLWriteDisplay::alignCenter() {
-  setAlignment(Qt::AlignHCenter);
-};
-
-void CHTMLWriteDisplay::alignRight() {
-  setAlignment(Qt::AlignRight);
-};
-
-
-/** The text's alignment changed. Enable the right buttons. */
-void CHTMLWriteDisplay::slotAlignmentChanged( int a ){
-  bool alignLeft = false;
-  bool alignCenter = false;
-  bool alignRight = false;
-//  bool alignJustify = false;
-
-  if (a & Qt::AlignLeft) {
-    alignLeft = true;
-  }
-  else if ((a & Qt::AlignHCenter) || (a & Qt::AlignCenter)) {
-    alignCenter = true;
-  }
-  else if (a & Qt::AlignRight) {
-    alignRight = true;
-  }
-//  else if (a & Qt::AlignJustify) {
-//    alignJustify = true;
-//  }
-  else {
-    alignLeft = true;
-    qWarning("unknown alignment %i", a);
-  }
-
-  m_actions.alignLeft->setChecked( alignLeft );
-  m_actions.alignCenter->setChecked( alignCenter );
-  m_actions.alignRight->setChecked( alignRight );    
-//  m_actions.alignJustify->setChecked( alignJustify );
-}
-
-
-/** Is called when a new color was selected. */
-void CHTMLWriteDisplay::slotColorSelected( const QColor& c){
-  setColor( c );
-}
-
-/** Is called when a text with another color was selected. */
-void CHTMLWriteDisplay::slotColorChanged(const QColor& c){
-  m_colorButton->setColor(c);
-}
-
-
-void CHTMLWriteDisplay::slotFontChanged( const QFont& font ) {
-  m_actions.fontChooser->setFont( font.family() );
-  m_actions.fontSizeChooser->setFontSize( font.pointSize() );
-
-  m_actions.bold->setChecked( font.bold() );
-  m_actions.italic->setChecked( font.italic() );
-  m_actions.underline->setChecked( font.underline() );
-};
-
-void CHTMLWriteDisplay::setupToolbar(KToolBar * bar, KActionCollection * actions) {
-  m_actions.fontChooser = new KFontAction( i18n("Choose a font"),
-    CResMgr::displaywindows::writeWindow::underlinedText::accel,
-    actions,
-		CResMgr::displaywindows::writeWindow::fontFamily::actionName
-  );
-  m_actions.fontChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontFamily::tooltip );
-  m_actions.fontChooser->setWhatsThis( CResMgr::displaywindows::writeWindow::fontFamily::whatsthis );
-  m_actions.fontChooser->plug(bar);
-  connect(m_actions.fontChooser, SIGNAL(activated(const QString&)), this, SLOT(setFamily(const QString&)));
-
-
-  m_actions.fontSizeChooser = new KFontSizeAction( i18n("Choose a font size"),
-    CResMgr::displaywindows::writeWindow::fontSize::accel,
-    actions,
-		CResMgr::displaywindows::writeWindow::fontSize::actionName
-  );
-  m_actions.fontSizeChooser->setToolTip( CResMgr::displaywindows::writeWindow::fontSize::tooltip );
-  m_actions.fontSizeChooser->setWhatsThis( CResMgr::displaywindows::writeWindow::fontSize::whatsthis );
-  m_actions.fontSizeChooser->plug(bar);
-  connect(m_actions.fontSizeChooser, SIGNAL(fontSizeChanged(int)), this, SLOT(setPointSize(int)));
-
-  m_colorButton = new KColorButton(bar);
-  connect(m_colorButton, SIGNAL(changed(const QColor&)), this, SLOT(slotColorSelected(const QColor&)));
-  bar->insertWidget(50, m_colorButton->sizeHint().width(), m_colorButton);
-  QToolTip::add(m_colorButton, CResMgr::displaywindows::writeWindow::fontColor::tooltip );
-  QWhatsThis::add(m_colorButton, CResMgr::displaywindows::writeWindow::fontColor::whatsthis );
-
-
-  (new KActionSeparator())->plug(bar); //seperate font options from formatting buttons
-
- 	m_actions.bold = new KToggleAction( i18n("Bold"),
-    CResMgr::displaywindows::writeWindow::boldText::icon,
-    CResMgr::displaywindows::writeWindow::boldText::accel,
-    this, SLOT(toggleBold()),
-    actions,
-		CResMgr::displaywindows::writeWindow::boldText::actionName
-  );
-  m_actions.bold->setToolTip( CResMgr::displaywindows::writeWindow::boldText::tooltip );
-  m_actions.bold->setWhatsThis( CResMgr::displaywindows::writeWindow::boldText::whatsthis );
-  m_actions.bold->plug(bar);
-
- 	m_actions.italic = new KToggleAction( i18n("Italic"),
-    CResMgr::displaywindows::writeWindow::italicText::icon,
-    CResMgr::displaywindows::writeWindow::italicText::accel,
-    this, SLOT(toggleItalic()),
-    actions,
-		CResMgr::displaywindows::writeWindow::italicText::actionName
-  );
-  m_actions.italic->setToolTip( CResMgr::displaywindows::writeWindow::italicText::tooltip );
-  m_actions.italic->setWhatsThis( CResMgr::displaywindows::writeWindow::italicText::whatsthis );
-  m_actions.italic->plug(bar);
-
- 	m_actions.underline = new KToggleAction( i18n("Underline"),
-    CResMgr::displaywindows::writeWindow::underlinedText::icon,
-    CResMgr::displaywindows::writeWindow::underlinedText::accel,
-    this, SLOT(toggleUnderline()),
-    actions,
-		CResMgr::displaywindows::writeWindow::underlinedText::actionName
-  );
-  m_actions.underline->setToolTip( CResMgr::displaywindows::writeWindow::underlinedText::tooltip );
-  m_actions.underline->setWhatsThis( CResMgr::displaywindows::writeWindow::underlinedText::whatsthis );
-  m_actions.underline->plug(bar);
-
-
-  (new KActionSeparator())->plug(bar); //seperate formatting from alignment buttons
-
- 	m_actions.alignLeft = new KToggleAction( i18n("Left"),
-    CResMgr::displaywindows::writeWindow::alignLeft::icon,
-    CResMgr::displaywindows::writeWindow::alignLeft::accel,
-    this, SLOT( alignLeft()  ),
-    actions,
-		CResMgr::displaywindows::writeWindow::alignLeft::actionName
-  );
-  m_actions.alignLeft->setToolTip( CResMgr::displaywindows::writeWindow::alignLeft::tooltip );
-  m_actions.alignLeft->setWhatsThis( CResMgr::displaywindows::writeWindow::alignLeft::whatsthis );
-  m_actions.alignLeft->plug(bar);
-
- 	m_actions.alignCenter = new KToggleAction( i18n("Center"),
-    CResMgr::displaywindows::writeWindow::alignCenter::icon,
-    CResMgr::displaywindows::writeWindow::alignCenter::accel,
-    this, SLOT(alignCenter()),
-    actions,
-		CResMgr::displaywindows::writeWindow::alignCenter::actionName
-  );
-  m_actions.alignCenter->setToolTip( CResMgr::displaywindows::writeWindow::alignCenter::tooltip );
-  m_actions.alignCenter->setWhatsThis( CResMgr::displaywindows::writeWindow::alignCenter::whatsthis );
-  m_actions.alignCenter->plug(bar);
-
- 	m_actions.alignRight = new KToggleAction( i18n("Right"),
-    CResMgr::displaywindows::writeWindow::alignRight::icon,
-    CResMgr::displaywindows::writeWindow::alignRight::accel,
-    this, SLOT(alignRight()),
-    actions,
-		CResMgr::displaywindows::writeWindow::alignRight::actionName
-  );
-  m_actions.alignRight->setToolTip( CResMgr::displaywindows::writeWindow::alignRight::tooltip );
-  m_actions.alignRight->setWhatsThis( CResMgr::displaywindows::writeWindow::alignRight::whatsthis );
-  m_actions.alignRight->plug(bar);
-
-// 	m_actions.alignJustify = new KToggleAction( i18n("Justify"),
-//    CResMgr::displaywindows::writeWindow::alignJustify::icon,
-//    CResMgr::displaywindows::writeWindow::alignJustify::accel,
-//    this, SLOT( alignJustify()  ),
-//    actions
-//  );
-//  m_actions.alignJustify->setToolTip( CResMgr::displaywindows::writeWindow::alignJustify::tooltip );
-//  m_actions.alignJustify->setWhatsThis( CResMgr::displaywindows::writeWindow::alignJustify::whatsthis );
-//  m_actions.alignJustify->plug(bar);
-
-
-  connect(this, SIGNAL(currentFontChanged(const QFont&)), SLOT(slotFontChanged(const QFont&)));
-  connect(this, SIGNAL(currentAlignmentChanged(int)), SLOT(slotAlignmentChanged(int)));
-  connect(this, SIGNAL(currentColorChanged(const QColor&)), SLOT(slotColorChanged(const QColor&)));
-
-
-  //set initial values for toolbar items
-  slotFontChanged( font() );
-  slotAlignmentChanged( alignment() );
-  slotColorChanged( color() );
-}
-
-/** Reimplementation to show a popup menu if the right mouse butoon was clicked. */
-QPopupMenu* CHTMLWriteDisplay::createPopupMenu( const QPoint& /*pos*/ ){
-  if (!m_actions.selectAll) {
- 	  m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), this, SLOT(selectAll()), this);
-  }
-  
-  KPopupMenu* popup = new KPopupMenu(this);
-	popup->insertTitle(i18n("HTML editor window"));
-  m_actions.selectAll->plug(popup);  
-
-  return popup;
-};
diff --git a/bibletime/frontend/display/chtmlwritedisplay.h b/bibletime/frontend/display/chtmlwritedisplay.h
deleted file mode 100644
index 1a47503..0000000
--- a/bibletime/frontend/display/chtmlwritedisplay.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/***************************************************************************
-                          chtmlwritedisplay.h  -  description
-                             -------------------
-    begin                : Fre Nov 29 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CHTMLWRITEDISPLAY_H
-#define CHTMLWRITEDISPLAY_H
-
-//BibleTime includes
-#include "cplainwritedisplay.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qtextedit.h>
-
-class CWriteWindow;
-
-class QPopupMenu;
-
-class KToggleAction;
-class KFontAction;
-class KFontSizeAction;
-
-class KColorButton;
-
-/** The WYSIWYG implementation of the write display interface.
-  * @author The BibleTime team
-  */
-class CHTMLWriteDisplay : public CPlainWriteDisplay  {
-   Q_OBJECT
-public: 
-  /**
-  * Returns the text of this edit widget.
-  */
-  virtual const QString plainText();
-
-  /**
-  * Creates the necessary action objects and puts them on the toolbar.
-  */
-  virtual void setupToolbar(KToolBar * bar, KActionCollection * actionCollection);
-  
-protected:
-	friend class CDisplay;
-	CHTMLWriteDisplay(CWriteWindow* parentWindow, QWidget* parent);
-	~CHTMLWriteDisplay();  
-  /**
-  * Reimplementation to show a popup menu if the right mouse butoon was clicked.
-  */
-  virtual QPopupMenu* createPopupMenu( const QPoint& pos );
-
-protected slots:
-  void toggleBold();
-  void toggleItalic();
-  void toggleUnderline();
-
-  void alignLeft();  
-  void alignCenter();
-  void alignRight();
-        
-  void slotFontChanged( const QFont& );  
-  /**
-  * The text's alignment changed. Enable the right buttons.
-  */
-  void slotAlignmentChanged( int );
-  /**
-  * Is called when a new color was selected.
-  */
-  void slotColorSelected( const QColor& );
-  /**
-  * Is called when a text with another color was selected.
-  */
-  void slotColorChanged( const QColor& );
-        
-private:
-  struct {
-    KToggleAction* bold;
-    KToggleAction* italic;
-    KToggleAction* underline;
-
-    KToggleAction* alignLeft;
-	  KToggleAction* alignCenter;
-  	KToggleAction* alignRight;
-   
-    KFontAction* fontChooser;
-    KFontSizeAction* fontSizeChooser;
-
-    //popup menu
-    KAction* selectAll;
-  } m_actions;
-  KColorButton* m_colorButton;
-};
-
-#endif
diff --git a/bibletime/frontend/display/cplainwritedisplay.cpp b/bibletime/frontend/display/cplainwritedisplay.cpp
deleted file mode 100644
index 0352583..0000000
--- a/bibletime/frontend/display/cplainwritedisplay.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/***************************************************************************
-                          cplainwritedisplay.cpp  -  description
-                             -------------------
-    begin                : Fre Okt 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cplainwritedisplay.h"
-
-#include "frontend/cdragdropmgr.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/cwritewindow.h"
-
-#include "util/scoped_resource.h"
-
-//Qt includes
-
-//KDE includes
-#include <kaction.h>
-#include <klocale.h>
-
-CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, QWidget* parent) : QTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) {
-//  qWarning("constructor of CPlainWriteDisplay");
-  setTextFormat(Qt::PlainText);
-  setAcceptDrops(true);
-  viewport()->setAcceptDrops(true);
-  
-  connect(this, SIGNAL(textChanged()),
-    connectionsProxy(), SLOT(emitTextChanged()));
-}
-
-CPlainWriteDisplay::~CPlainWriteDisplay(){
-
-}
-
-/** Reimplementation. */
-void CPlainWriteDisplay::selectAll(){
-  QTextEdit::selectAll(true);
-}
-
-void CPlainWriteDisplay::setText( const QString& newText ) {
-  QTextEdit::setText(newText);
-};
-
-const bool CPlainWriteDisplay::hasSelection() {
-  return hasSelectedText();
-};
-
-QWidget* CPlainWriteDisplay::view() {
-  qWarning("CPlainWriteDisplay::view()");
-  return this;
-};
-
-const QString CPlainWriteDisplay::text( const CDisplay::TextType /*format*/, const CDisplay::TextPart /*part*/) {
-  return QString::null;
-};
-
-void CPlainWriteDisplay::print( const CDisplay::TextPart ) {
-
-};
-
-/** Sets the current status of the edit widget. */
-void CPlainWriteDisplay::setModified( const bool modified ){
-  QTextEdit::setModified(modified);
-}
-
-/** Reimplementation. */
-const bool CPlainWriteDisplay::isModified() const{
-  return QTextEdit::isModified();
-}
-
-
-/** Returns the text of this edit widget. */
-const QString CPlainWriteDisplay::plainText(){
-  return QTextEdit::text();
-}
-
-/** Reimplementation from QTextEdit. Provides an popup menu for the given position. */
-QPopupMenu* CPlainWriteDisplay::createPopupMenu( const QPoint& /*pos*/ ){
-  return installedPopup();
-}
-
-/** Reimplementation from QTextEdit. Provides an popup menu for the given position. */
-QPopupMenu* CPlainWriteDisplay::createPopupMenu( ){
-  return installedPopup();
-}
-
-/** Creates the necessary action objects and puts them on the toolbar. */
-void CPlainWriteDisplay::setupToolbar(KToolBar* /*bar*/, KActionCollection* /*actionCollection*/) {
-}
-
-/** Reimplementation to insert the text of a dragged reference into the edit view. */
-void CPlainWriteDisplay::contentsDragEnterEvent( QDragEnterEvent* e ){
-  if (CDragDropMgr::canDecode(e)) {
-    e->accept(true);
-  }
-  else {
-    e->accept(false);
-    e->ignore();
-  }
-}
-
-/** Reimplementation to insert the text of a dragged reference into the edit view. */
-void CPlainWriteDisplay::contentsDragMoveEvent( QDragMoveEvent* e ){
-  if (CDragDropMgr::canDecode(e)) {
-    placeCursor(e->pos());
-    ensureCursorVisible();
-    e->accept(true);
-  }
-  else {
-    e->accept(false);
-    e->ignore();
-  }
-}
-
-/** Reimplementation to manage drops of our drag and drop objects. */
-void CPlainWriteDisplay::contentsDropEvent( QDropEvent* e ){
-  if ( CDragDropMgr::canDecode(e) ) {
-    e->acceptAction();
-
-    CDragDropMgr::ItemList items = CDragDropMgr::decode(e);
-    CDragDropMgr::ItemList::iterator it;
-    for (it = items.begin(); it != items.end(); ++it) {
-      switch ((*it).type()) {
-        case CDragDropMgr::Item::Bookmark:
-        {
-          CSwordModuleInfo* module = backend()->findModuleByName((*it).bookmarkModule());
-          util::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
-          key->key( (*it).bookmarkKey() );
-
-          QString moduleText = key->strippedText();
-          
-          const QString text = QString::fromLatin1("%1\n(%2, %3)\n").arg(moduleText).arg((*it).bookmarkKey()).arg((*it).bookmarkModule());
-          
-          placeCursor( e->pos() );
-          insert( text );
-          break;        
-        }
-        case CDragDropMgr::Item::Text:
-        {
-          placeCursor( e->pos() );
-          insert( (*it).text() );
-          break;
-        }  
-        default:
-          break;
-      }
-      
-    };
-  }
-}
diff --git a/bibletime/frontend/display/cplainwritedisplay.h b/bibletime/frontend/display/cplainwritedisplay.h
deleted file mode 100644
index 7407aff..0000000
--- a/bibletime/frontend/display/cplainwritedisplay.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/***************************************************************************
-                          cplainwritedisplay.h  -  description
-                             -------------------
-    begin                : Fre Okt 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPLAINWRITEDISPLAY_H
-#define CPLAINWRITEDISPLAY_H
-
-//Bibletime include files
-#include "cwritedisplay.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qtextedit.h>
-
-class CHTMLWriteDisplay;
-class KAction;
-
-/** The write display implementation for plain source code editing.
-  * @author The BibleTime team
-  */
-class CPlainWriteDisplay : public QTextEdit, public CWriteDisplay  {
-public: 
-  /**
-  * Reimplementation.
-  */
-  virtual void selectAll();
-  /**
-  * Sets the new text for this display widget.
-  */
-  virtual void setText( const QString& newText );
-  /**
-  * Returns true if the display widget has a selection. Otherwise false.
-  */
-  virtual const bool hasSelection();
-  /**
-  * Returns the view of this display widget.
-  */
-  virtual QWidget* view();
-  virtual const QString text( const CDisplay::TextType format = CDisplay::HTMLText, const CDisplay::TextPart part = CDisplay::Document );
-  virtual void print( const CDisplay::TextPart );
-  /**
-  * Reimplementation.
-  */
-  virtual const bool isModified() const;
-  /**
-  * Sets the current status of the edit widget.
-  */
-  virtual void setModified( const bool modified );
-  /**
-  * Returns the text of this edit widget.
-  */
-  virtual const QString plainText();
-  /**
-  * Creates the necessary action objects and puts them on the toolbar.
-  */
-  virtual void setupToolbar(KToolBar * bar, KActionCollection * actionCollection);
-  
-protected:
-	friend class CDisplay;
- 	friend class CHTMLWriteDisplay;
-  
-	CPlainWriteDisplay(CWriteWindow* parentWindow, QWidget* parent);
-	virtual ~CPlainWriteDisplay();
-  /**
-  * Reimplementation from QTextEdit. Provides an popup menu for the given position.
-  */
-  virtual QPopupMenu* createPopupMenu( const QPoint& pos );
-  /**
-  * Reimplementation from QTextEdit. Provides an popup menu.
-  */
-  virtual QPopupMenu* createPopupMenu();
-  /**
-  * Reimplementation to manage drops of our drag and drop objects.
-  */
-  virtual void contentsDropEvent( QDropEvent* e );
-  /**
-  * Reimplementation to insert the text of a dragged reference into the edit view.
-  */
-  virtual void contentsDragEnterEvent( QDragEnterEvent* e );
-  /**
-  * Reimplementation to insert the text of a dragged reference into the edit view.
-  */
-  virtual void contentsDragMoveEvent( QDragMoveEvent* e );
-
-};
-
-#endif
diff --git a/bibletime/frontend/display/creaddisplay.cpp b/bibletime/frontend/display/creaddisplay.cpp
deleted file mode 100644
index 4b6bf15..0000000
--- a/bibletime/frontend/display/creaddisplay.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-/***************************************************************************
-                          creaddisplay.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "creaddisplay.h"
-
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbiblemoduleinfo.h"
-#include "backend/cswordlexiconmoduleinfo.h"
-#include "backend/cswordbookmoduleinfo.h"
-#include "backend/cswordkey.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordtreekey.h"
-#include "backend/cswordldkey.h"
-
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/creadwindow.h"
-
-#include "frontend/cexportmanager.h"
-
-#include "util/scoped_resource.h"
-
-//Qt includes
-#include <qpopupmenu.h>
-
-//KDE includes
-#include <klocale.h>
-
-CReadDisplay::CReadDisplay(CReadWindow* readWindow) : CDisplay(readWindow), m_activeAnchor(QString::null) {
-}
-
-CReadDisplay::~CReadDisplay(){
-}
-
-/** Returns the current active anchor. */
-const QString& CReadDisplay::activeAnchor(){
-  return m_activeAnchor;
-}
-
-/** Sets the current anchor to the parameter. */
-void CReadDisplay::setActiveAnchor( const QString& anchor ){
-  m_activeAnchor = anchor;
-}
-
-
-/** Returns true if the display has an active anchor. */
-const bool CReadDisplay::hasActiveAnchor(){
-  return !activeAnchor().isEmpty();
-}
-
-
-void CReadDisplay::print(const CDisplay::TextPart type){
-  CDisplayWindow* window = parentWindow();
-  CSwordKey* const key = window->key();
-  CSwordModuleInfo* module = key->module();
-
-  
-  CExportManager mgr(i18n("Print keys"),false, QString::null, parentWindow()->filterOptions(), parentWindow()->displayOptions());
-        
-  switch (type) {
-		case Document: {
-			if (module->type() == CSwordModuleInfo::Bible) {
-   			CSwordVerseKey* vk = dynamic_cast<CSwordVerseKey*>(key);
-
-      	CSwordVerseKey startKey(*vk);
-				startKey.Verse(1);	
-				
-    		CSwordVerseKey stopKey(*vk);
-				if (CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(module))
-					stopKey.Verse( bible->verseCount( bible->bookNumber(startKey.book()), startKey.Chapter() ) );
-				mgr.printKey(module, startKey.key(), stopKey.key());
-  		}
-    	else if (module->type() == CSwordModuleInfo::Lexicon || module->type() == CSwordModuleInfo::Commentary ) {
-    		mgr.printKey(module, key->key(), key->key());
-      }
-      else if (module->type() == CSwordModuleInfo::GenericBook) {
-   			CSwordTreeKey* tree = dynamic_cast<CSwordTreeKey*>(key);
-
-        CSwordTreeKey startKey(*tree);
-//        while (startKey.previousSibling()) { // go to first sibling on this level!
-//        }
-
-    		CSwordTreeKey stopKey(*tree);
-//				if (CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(module)) {
-//          while ( stopKey.nextSibling() ) { //go to last displayed sibling!
-//          }
-//        }
-				mgr.printKey(module, startKey.key(), stopKey.key());
-      }
-    };
-
-    case AnchorWithText: {
-      if (hasActiveAnchor()) {
-				mgr.printByHyperlink( activeAnchor() );
-      };
-    };
-
-    default:
-    	break;
-	}
-}
-
diff --git a/bibletime/frontend/display/creaddisplay.h b/bibletime/frontend/display/creaddisplay.h
deleted file mode 100644
index e6d3a53..0000000
--- a/bibletime/frontend/display/creaddisplay.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/***************************************************************************
-                          creaddisplay.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CREADDISPLAY_H
-#define CREADDISPLAY_H
-
-#include "cdisplay.h"
-
-class QPopupMenu;
-class QWidget;
-
-/**The base class for all read-only widgets like KHTMLView.
-  *@author The BibleTime team
-  */
-
-class CReadDisplay :  public CDisplay {
-public:
-  /**
-  * Returns true if the display has an active anchor.
-  */
-  const bool hasActiveAnchor();
-  /**
-  * Returns the current active anchor.
-  */
-  const QString& activeAnchor();
-  /**
-  * Moves the widget to the given anchor.
-  */
-  virtual void moveToAnchor( const QString& ) = 0;
-  virtual void print(const CDisplay::TextPart);
-
-
-protected: // Protected methods
-	friend class CDisplay;
- 	friend class CHTMLReadDisplay;
- 	friend class CHTMLReadDisplayView;
-
-	CReadDisplay( CReadWindow* readWindow );
-	~CReadDisplay();
-
-  /**
-  * Sets the current anchor to the parameter.
-  */
-  void setActiveAnchor( const QString& );
-
-private: // Public attributes
-  /**
-  * The member which hols the current anchor.
-  */
-
-  QString m_activeAnchor;
-};
-
-#endif
diff --git a/bibletime/frontend/display/cwritedisplay.cpp b/bibletime/frontend/display/cwritedisplay.cpp
deleted file mode 100644
index 0456457..0000000
--- a/bibletime/frontend/display/cwritedisplay.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/***************************************************************************
-                          cwritedisplay.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cwritedisplay.h"
-
-#include "frontend/displaywindow/cwritewindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-CWriteDisplay::CWriteDisplay( CWriteWindow* writeWindow ) : CDisplay(writeWindow) {
-}
-
-CWriteDisplay::~CWriteDisplay(){
-}
-
diff --git a/bibletime/frontend/display/cwritedisplay.h b/bibletime/frontend/display/cwritedisplay.h
deleted file mode 100644
index 283c744..0000000
--- a/bibletime/frontend/display/cwritedisplay.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/***************************************************************************
-                          cwritedisplay.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CWRITEDISPLAY_H
-#define CWRITEDISPLAY_H
-
-#include "cdisplay.h"
-
-class KActionCollection;
-class KToolBar;
-
-/**The base class for all read/write-display classes.
-  *@author The BibleTime team
-  */
-
-class CWriteDisplay : public CDisplay  {
-protected:
-	friend class CDisplay;
- 	friend class CPlainWriteDisplay;  
-	CWriteDisplay( CWriteWindow* writeWindow );
-	~CWriteDisplay();
-
-public: // Public methods
-  /**
-  * Sets the current modified status of the widget.
-  */
-  virtual void setModified( const bool modified ) = 0;
-  /**
-  * Returns true if the current text was modified.
-  */
-  virtual const bool isModified() const = 0;
-  /**
-  * Returns the text of this edit widget.
-  */
-  virtual const QString plainText() = 0;
-  /**
-  * Creates the necessary action objects and puts them on the toolbar.
-  */
-  virtual void setupToolbar( KToolBar* bar, KActionCollection* actionCollection ) = 0;
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/Makefile.am b/bibletime/frontend/displaywindow/Makefile.am
deleted file mode 100644
index a86417c..0000000
--- a/bibletime/frontend/displaywindow/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-INCLUDES = $(all_includes)
-
-libdisplaywindow_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libdisplaywindow.a
-
-libdisplaywindow_a_SOURCES = \
-cbiblereadwindow.cpp \
-cbookreadwindow.cpp \
-ccommentaryreadwindow.cpp \
-cdisplaywindow.cpp \
-clexiconreadwindow.cpp \
-cmodulechooserbar.cpp \
-cmodulechooserbutton.cpp \
-creadwindow.cpp \
-cwritewindow.cpp \
-cplainwritewindow.cpp \
-chtmlwritewindow.cpp \
-cbuttons.cpp
-
-all_headers = \
-cbiblereadwindow.h \
-cbookreadwindow.h \
-ccommentaryreadwindow.h \
-cdisplaywindow.h \
-clexiconreadwindow.h \
-cmodulechooserbar.h \
-cmodulechooserbutton.h \
-creadwindow.h \
-cwritewindow.h \
-cplainwritewindow.h \
-chtmlwritewindow.h \
-cbuttons.h
-
-EXTRA_DIST = $(libdisplaywindow_a_SOURCES) $(all_headers)
-
diff --git a/bibletime/frontend/displaywindow/Makefile.in b/bibletime/frontend/displaywindow/Makefile.in
deleted file mode 100644
index 457e00d..0000000
--- a/bibletime/frontend/displaywindow/Makefile.in
+++ /dev/null
@@ -1,836 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-
-#>- libdisplaywindow_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libdisplaywindow.a
-
-libdisplaywindow_a_SOURCES = \
-cbiblereadwindow.cpp \
-cbookreadwindow.cpp \
-ccommentaryreadwindow.cpp \
-cdisplaywindow.cpp \
-clexiconreadwindow.cpp \
-cmodulechooserbar.cpp \
-cmodulechooserbutton.cpp \
-creadwindow.cpp \
-cwritewindow.cpp \
-cplainwritewindow.cpp \
-chtmlwritewindow.cpp \
-cbuttons.cpp
-
-
-all_headers = \
-cbiblereadwindow.h \
-cbookreadwindow.h \
-ccommentaryreadwindow.h \
-cdisplaywindow.h \
-clexiconreadwindow.h \
-cmodulechooserbar.h \
-cmodulechooserbutton.h \
-creadwindow.h \
-cwritewindow.h \
-cplainwritewindow.h \
-chtmlwritewindow.h \
-cbuttons.h
-
-
-EXTRA_DIST = $(libdisplaywindow_a_SOURCES) $(all_headers)
-subdir = bibletime/frontend/displaywindow
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libdisplaywindow_a_AR = $(AR) cru
-libdisplaywindow_a_LIBADD =
-am_libdisplaywindow_a_OBJECTS = cbiblereadwindow.$(OBJEXT) \
-	cbookreadwindow.$(OBJEXT) ccommentaryreadwindow.$(OBJEXT) \
-	cdisplaywindow.$(OBJEXT) clexiconreadwindow.$(OBJEXT) \
-	cmodulechooserbar.$(OBJEXT) cmodulechooserbutton.$(OBJEXT) \
-	creadwindow.$(OBJEXT) cwritewindow.$(OBJEXT) \
-	cplainwritewindow.$(OBJEXT) chtmlwritewindow.$(OBJEXT) \
-	cbuttons.$(OBJEXT)
-#>- libdisplaywindow_a_OBJECTS = $(am_libdisplaywindow_a_OBJECTS)
-#>+ 11
-libdisplaywindow_a_final_OBJECTS = libdisplaywindow_a.all_cpp.o 
-libdisplaywindow_a_nofinal_OBJECTS = cbiblereadwindow.$(OBJEXT) \
-	cbookreadwindow.$(OBJEXT) ccommentaryreadwindow.$(OBJEXT) \
-	cdisplaywindow.$(OBJEXT) clexiconreadwindow.$(OBJEXT) \
-	cmodulechooserbar.$(OBJEXT) cmodulechooserbutton.$(OBJEXT) \
-	creadwindow.$(OBJEXT) cwritewindow.$(OBJEXT) \
-	cplainwritewindow.$(OBJEXT) chtmlwritewindow.$(OBJEXT) \
-	cbuttons.$(OBJEXT)\
-cmodulechooserbutton.moc.o cplainwritewindow.moc.o chtmlwritewindow.moc.o ccommentaryreadwindow.moc.o cbuttons.moc.o cbookreadwindow.moc.o cmodulechooserbar.moc.o creadwindow.moc.o cdisplaywindow.moc.o cbiblereadwindow.moc.o cwritewindow.moc.o clexiconreadwindow.moc.o 
-@KDE_USE_FINAL_FALSE@libdisplaywindow_a_OBJECTS = $(libdisplaywindow_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libdisplaywindow_a_OBJECTS = $(libdisplaywindow_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cbiblereadwindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cbookreadwindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cbuttons.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/ccommentaryreadwindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cdisplaywindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/chtmlwritewindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/clexiconreadwindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cmodulechooserbar.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cmodulechooserbutton.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cplainwritewindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/creadwindow.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cwritewindow.Po
-#>+ 24
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/cmodulechooserbutton.moc.P $(DEPDIR)/cplainwritewindow.moc.P $(DEPDIR)/chtmlwritewindow.moc.P $(DEPDIR)/ccommentaryreadwindow.moc.P $(DEPDIR)/cbuttons.moc.P $(DEPDIR)/cbookreadwindow.moc.P $(DEPDIR)/cmodulechooserbar.moc.P $(DEPDIR)/creadwindow.moc.P $(DEPDIR)/cdisplaywindow.moc.P $(DEPDIR)/cbiblereadwindow.moc.P $(DEPDIR)/cwritewindow.moc.P $(DEPDIR)/clexiconreadwindow.moc.P  $(DEPDIR)/libdisplaywindow_a.all_cpp.P ./$(DEPDIR)/cbiblereadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cbookreadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cbuttons.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ccommentaryreadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cdisplaywindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/chtmlwritewindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/clexiconreadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cmodulechooserbar.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cmodulechooserbutton.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cplainwritewindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/creadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cwritewindow.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/cmodulechooserbutton.moc.P $(DEPDIR)/cplainwritewindow.moc.P $(DEPDIR)/chtmlwritewindow.moc.P $(DEPDIR)/ccommentaryreadwindow.moc.P $(DEPDIR)/cbuttons.moc.P $(DEPDIR)/cbookreadwindow.moc.P $(DEPDIR)/cmodulechooserbar.moc.P $(DEPDIR)/creadwindow.moc.P $(DEPDIR)/cdisplaywindow.moc.P $(DEPDIR)/cbiblereadwindow.moc.P $(DEPDIR)/cwritewindow.moc.P $(DEPDIR)/clexiconreadwindow.moc.P ./$(DEPDIR)/cbiblereadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cbookreadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cbuttons.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ccommentaryreadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cdisplaywindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/chtmlwritewindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/clexiconreadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cmodulechooserbar.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cmodulechooserbutton.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cplainwritewindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/creadwindow.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cwritewindow.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libdisplaywindow_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libdisplaywindow_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/frontend/displaywindow/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/displaywindow/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/displaywindow/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libdisplaywindow.a: $(libdisplaywindow_a_OBJECTS) $(libdisplaywindow_a_DEPENDENCIES) 
-	-rm -f libdisplaywindow.a
-	$(libdisplaywindow_a_AR) libdisplaywindow.a $(libdisplaywindow_a_OBJECTS) $(libdisplaywindow_a_LIBADD)
-	$(RANLIB) libdisplaywindow.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbiblereadwindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbookreadwindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbuttons.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ccommentaryreadwindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cdisplaywindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chtmlwritewindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clexiconreadwindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmodulechooserbar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmodulechooserbutton.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cplainwritewindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creadwindow.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cwritewindow.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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:  $(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 "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-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
-
-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-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-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.
-.NOEXPORT:
-
-#>+ 3
-cmodulechooserbutton.moc.cpp: $(srcdir)/cmodulechooserbutton.h
-	$(MOC) $(srcdir)/cmodulechooserbutton.h -o cmodulechooserbutton.moc.cpp
-
-#>+ 2
-mocs: cmodulechooserbutton.moc.cpp
-
-#>+ 3
-cplainwritewindow.moc.cpp: $(srcdir)/cplainwritewindow.h
-	$(MOC) $(srcdir)/cplainwritewindow.h -o cplainwritewindow.moc.cpp
-
-#>+ 2
-mocs: cplainwritewindow.moc.cpp
-
-#>+ 3
-chtmlwritewindow.moc.cpp: $(srcdir)/chtmlwritewindow.h
-	$(MOC) $(srcdir)/chtmlwritewindow.h -o chtmlwritewindow.moc.cpp
-
-#>+ 2
-mocs: chtmlwritewindow.moc.cpp
-
-#>+ 3
-ccommentaryreadwindow.moc.cpp: $(srcdir)/ccommentaryreadwindow.h
-	$(MOC) $(srcdir)/ccommentaryreadwindow.h -o ccommentaryreadwindow.moc.cpp
-
-#>+ 2
-mocs: ccommentaryreadwindow.moc.cpp
-
-#>+ 3
-cbuttons.moc.cpp: $(srcdir)/cbuttons.h
-	$(MOC) $(srcdir)/cbuttons.h -o cbuttons.moc.cpp
-
-#>+ 2
-mocs: cbuttons.moc.cpp
-
-#>+ 3
-cbookreadwindow.moc.cpp: $(srcdir)/cbookreadwindow.h
-	$(MOC) $(srcdir)/cbookreadwindow.h -o cbookreadwindow.moc.cpp
-
-#>+ 2
-mocs: cbookreadwindow.moc.cpp
-
-#>+ 3
-cmodulechooserbar.moc.cpp: $(srcdir)/cmodulechooserbar.h
-	$(MOC) $(srcdir)/cmodulechooserbar.h -o cmodulechooserbar.moc.cpp
-
-#>+ 2
-mocs: cmodulechooserbar.moc.cpp
-
-#>+ 3
-creadwindow.moc.cpp: $(srcdir)/creadwindow.h
-	$(MOC) $(srcdir)/creadwindow.h -o creadwindow.moc.cpp
-
-#>+ 2
-mocs: creadwindow.moc.cpp
-
-#>+ 3
-cdisplaywindow.moc.cpp: $(srcdir)/cdisplaywindow.h
-	$(MOC) $(srcdir)/cdisplaywindow.h -o cdisplaywindow.moc.cpp
-
-#>+ 2
-mocs: cdisplaywindow.moc.cpp
-
-#>+ 3
-cbiblereadwindow.moc.cpp: $(srcdir)/cbiblereadwindow.h
-	$(MOC) $(srcdir)/cbiblereadwindow.h -o cbiblereadwindow.moc.cpp
-
-#>+ 2
-mocs: cbiblereadwindow.moc.cpp
-
-#>+ 3
-cwritewindow.moc.cpp: $(srcdir)/cwritewindow.h
-	$(MOC) $(srcdir)/cwritewindow.h -o cwritewindow.moc.cpp
-
-#>+ 2
-mocs: cwritewindow.moc.cpp
-
-#>+ 3
-clexiconreadwindow.moc.cpp: $(srcdir)/clexiconreadwindow.h
-	$(MOC) $(srcdir)/clexiconreadwindow.h -o clexiconreadwindow.moc.cpp
-
-#>+ 2
-mocs: clexiconreadwindow.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  cmodulechooserbutton.moc.cpp cplainwritewindow.moc.cpp chtmlwritewindow.moc.cpp ccommentaryreadwindow.moc.cpp cbuttons.moc.cpp cbookreadwindow.moc.cpp cmodulechooserbar.moc.cpp creadwindow.moc.cpp cdisplaywindow.moc.cpp cbiblereadwindow.moc.cpp cwritewindow.moc.cpp clexiconreadwindow.moc.cpp
-
-#>+ 2
-KDE_DIST=cbuttons.h ccommentaryreadwindow.h cplainwritewindow.h cbookreadwindow.h chtmlwritewindow.h cbiblereadwindow.h cdisplaywindow.h cmodulechooserbar.h cmodulechooserbutton.h clexiconreadwindow.h creadwindow.h cwritewindow.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/displaywindow/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/displaywindow/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libdisplaywindow_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cbiblereadwindow.cpp $(srcdir)/cbookreadwindow.cpp $(srcdir)/ccommentaryreadwindow.cpp $(srcdir)/cdisplaywindow.cpp $(srcdir)/clexiconreadwindow.cpp $(srcdir)/cmodulechooserbar.cpp $(srcdir)/cmodulechooserbutton.cpp $(srcdir)/creadwindow.cpp $(srcdir)/cwritewindow.cpp $(srcdir)/cplainwritewindow.cpp $(srcdir)/chtmlwritewindow.cpp $(srcdir)/cbuttons.cpp cmodulechooserbutton.moc.cpp cplainwritewindow.moc.cpp ccommentaryreadwindow.moc.cpp chtmlwritewindow.moc.cpp cbookreadwindow.moc.cpp cbuttons.moc.cpp cmodulechooserbar.moc.cpp cdisplaywindow.moc.cpp creadwindow.moc.cpp cbiblereadwindow.moc.cpp cwritewindow.moc.cpp clexiconreadwindow.moc.cpp 
-	@echo 'creating libdisplaywindow_a.all_cpp.cpp ...'; \
-	rm -f libdisplaywindow_a.all_cpp.files libdisplaywindow_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libdisplaywindow_a.all_cpp.final; \
-	for file in cbiblereadwindow.cpp cbookreadwindow.cpp ccommentaryreadwindow.cpp cdisplaywindow.cpp clexiconreadwindow.cpp cmodulechooserbar.cpp cmodulechooserbutton.cpp creadwindow.cpp cwritewindow.cpp cplainwritewindow.cpp chtmlwritewindow.cpp cbuttons.cpp cmodulechooserbutton.moc.cpp cplainwritewindow.moc.cpp ccommentaryreadwindow.moc.cpp chtmlwritewindow.moc.cpp cbookreadwindow.moc.cpp cbuttons.moc.cpp cmodulechooserbar.moc.cpp cdisplaywindow.moc.cpp creadwindow.moc.cpp cbiblereadwindow.moc.cpp cwritewindow.moc.cpp clexiconreadwindow.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libdisplaywindow_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libdisplaywindow_a.all_cpp.final; \
-	done; \
-	cat libdisplaywindow_a.all_cpp.final libdisplaywindow_a.all_cpp.files > libdisplaywindow_a.all_cpp.cpp; \
-	rm -f libdisplaywindow_a.all_cpp.final libdisplaywindow_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libdisplaywindow_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libdisplaywindow_a_OBJECTS="$(libdisplaywindow_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libdisplaywindow_a_OBJECTS="$(libdisplaywindow_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libdisplaywindow_a_OBJECTS="$(libdisplaywindow_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libdisplaywindow_a_OBJECTS="$(libdisplaywindow_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp b/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
deleted file mode 100644
index fca7e8d..0000000
--- a/bibletime/frontend/displaywindow/cbiblereadwindow.cpp
+++ /dev/null
@@ -1,354 +0,0 @@
-/***************************************************************************
-                          cbiblereadwindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cbiblereadwindow.h"
-#include "ccommentaryreadwindow.h"
-#include "cbuttons.h"
-
-#include "backend/cswordversekey.h"
-#include "backend/cswordbiblemoduleinfo.h"
-
-#include "frontend/cprofilewindow.h"
-#include "frontend/cexportmanager.h"
-#include "frontend/cbtconfig.h"
-#include "frontend/cmdiarea.h"
-#include "util/cresmgr.h"
-
-#include "frontend/display/creaddisplay.h"
-#include "frontend/keychooser/ckeychooser.h"
-
-#include "util/ctoolclass.h"
-
-#include <math.h>
-
-//Qt includes
-#include <qwidgetlist.h>
-#include <qtimer.h>
-
-//KDE includes
-#include <kaccel.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
-
-CBibleReadWindow::CBibleReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name ) : CLexiconReadWindow(moduleList, parent,name) {
-  m_transliterationButton = 0;
-}
-
-CBibleReadWindow::~CBibleReadWindow(){
-}
-
-void CBibleReadWindow::applyProfileSettings( CProfileWindow* const settings ) {
-	CLexiconReadWindow::applyProfileSettings(settings);
-
-	const int count = displaySettingsButton()->menuItemCount();
-	int result = settings->windowSettings();
-	for (int i = count-1; i>=1; i--) {
-		if (result-(int)pow((double)2,i-1)>= 0) { //2^i was added before, so item with index i is set
-			result -= (int)pow((double)2,i-1);
-			displaySettingsButton()->setItemStatus(i,true);
-		}
-		else {
-			displaySettingsButton()->setItemStatus(i,false);
-  	}
-	}
-	displaySettingsButton()->setChanged();
-};
-
-void CBibleReadWindow::storeProfileSettings( CProfileWindow* const settings ) {
-	CLexiconReadWindow::storeProfileSettings(settings);
-
-	const int count = displaySettingsButton()->menuItemCount();
-	int result = 0;
-	//now check	every item
-	for (int i = 1; i < count; i++) { //first item is a title
-		if (displaySettingsButton()->itemStatus(i)) //item is checked
-			result += (int)pow((double)2,i-1);//add 2^i (the i. digit in binary)
-	}
-	settings->setWindowSettings(result);
-};
-
-
-/** Reimplementation. */
-void CBibleReadWindow::insertKeyboardActions( KAccel* const a ){
-  a->insert("Next book",        i18n("Next book"),        "", CResMgr::displaywindows::bibleWindow::nextBook::accel,        0, "");
-	a->insert("Previous book",    i18n("Previous book"),    "", CResMgr::displaywindows::bibleWindow::previousBook::accel,    0, "");
-	a->insert("Next chapter",     i18n("Next chapter"),     "", CResMgr::displaywindows::bibleWindow::nextChapter::accel,     0, "");
-	a->insert("Previous chapter", i18n("Previous chapter"), "", CResMgr::displaywindows::bibleWindow::previousChapter::accel, 0, "");
-	a->insert("Next verse",       i18n("Next verse"),       "", CResMgr::displaywindows::bibleWindow::nextVerse::accel,       0, "");
-	a->insert("Previous verse",   i18n("Previous verse"),   "", CResMgr::displaywindows::bibleWindow::previousVerse::accel,   0, "");
-}
-
-void CBibleReadWindow::initKeyboardActions() {
-  CReadWindow::initKeyboardActions();
-
-  CBTConfig::setupAccel( CBTConfig::bibleWindow, accel() );
-  insertKeyboardActions( accel() );
-  CReadWindow::insertKeyboardActions(accel());
-
-  accel()->readSettings(); 
-
-	accel()->setSlot("Next book", this, SLOT(nextBook()));
-  accel()->setSlot("Previous book", this, SLOT(previousBook()));
-  accel()->setSlot("Next chapter", this, SLOT(nextChapter()));
-  accel()->setSlot("Previous chapter", this, SLOT(previousChapter()));
-  accel()->setSlot("Next verse", this, SLOT(nextVerse()));
-  accel()->setSlot("Previous verse", this, SLOT(previousVerse()));
-}
-
-void CBibleReadWindow::initConnections(){
-//  connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)), SLOT(keyChanged(CSwordKey*)));
-  CLexiconReadWindow::initConnections();
-
-  if (m_transliterationButton) { // Transliteration is not always available
-    connect(m_transliterationButton, SIGNAL(sigChanged()), SLOT(lookup()));
-  }
-}
-
-void CBibleReadWindow::initView(){
- 	CLexiconReadWindow::initView();
-
-  parentWidget()->installEventFilter( this );  
-
-//  qWarning("initView: %i modules", modules().count());  
-  setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), mainToolBar()) );
-	mainToolBar()->insertWidget(2,displaySettingsButton()->size().width(),displaySettingsButton());
-
-	if (backend()->useICU()){
-	  m_transliterationButton = new CTransliterationButton(&filterOptions(), mainToolBar());
-		mainToolBar()->insertWidget( 3, m_transliterationButton->size().width(), m_transliterationButton );
-	}
-}
-
-/** Reimplementation. */
-void CBibleReadWindow::setupPopupMenu(){
-//	qWarning("CBibleReadWindow::setupPopupMenu()");
-	popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Bible window"));
-
- 	m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(selectAll()), actionCollection());
-  m_actions.selectAll->plug(popup());
-
-  (new KActionSeparator())->plug( popup() );
-
- 	m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::bibleWindow::copyMenu::icon);
- 	m_actions.copy.referenceOnly = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorOnly()), actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.referenceOnly);
-	m_actions.copy.referenceTextOnly = new KAction(i18n("Text of reference"), KShortcut(0),displayWidget()->connectionsProxy(), SLOT(copyAnchorTextOnly()), actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.referenceTextOnly);
-  m_actions.copy.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorWithText()), actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.referenceAndText);
-  m_actions.copy.chapter = new KAction(i18n("Chapter"), KShortcut(0), this, SLOT(copyDisplayedText()), actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.chapter);
-  m_actions.copyMenu->insert(new KActionSeparator());
-  m_actions.copy.selectedText = new KAction(i18n("Selected text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copySelection()),actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.selectedText);
-  m_actions.copyMenu->plug(popup());
-
- 	m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::displaywindows::bibleWindow::saveMenu::icon);
- 	m_actions.save.referenceAndText = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(saveAnchorWithText()), actionCollection());
- 	m_actions.saveMenu->insert(m_actions.save.referenceAndText);
-	m_actions.save.chapterAsPlain = new KAction(i18n("Chapter as plain text"), KShortcut(0), this, SLOT(saveChapterPlain()),actionCollection());
- 	m_actions.saveMenu->insert(m_actions.save.chapterAsPlain);
- 	m_actions.save.chapterAsHTML = new KAction(i18n("Chapter as HTML"), KShortcut(0), this, SLOT(saveChapterHTML()),actionCollection());
- 	m_actions.saveMenu->insert(m_actions.save.chapterAsHTML);
- 	m_actions.saveMenu->plug(popup());
-
- 	m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::displaywindows::bibleWindow::printMenu::icon);	
- 	m_actions.print.reference = new KAction(i18n("Reference with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(printAnchorWithText()), actionCollection());
- 	m_actions.printMenu->insert(m_actions.print.reference); 	
-  m_actions.print.chapter = new KAction(i18n("Chapter"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(printAll()),actionCollection());
- 	m_actions.printMenu->insert(m_actions.print.chapter);
- 	m_actions.printMenu->plug(popup());
-}
-
-/** Reimplemented. */
-void CBibleReadWindow::updatePopupMenu(){
-//	qWarning("CBibleReadWindow::updatePopupMenu()");
-
-  m_actions.copy.referenceOnly->setEnabled( displayWidget()->hasActiveAnchor() );
- 	m_actions.copy.referenceTextOnly->setEnabled( displayWidget()->hasActiveAnchor() );
- 	m_actions.copy.referenceAndText->setEnabled( displayWidget()->hasActiveAnchor() );
-	m_actions.copy.selectedText->setEnabled( displayWidget()->hasSelection() );
-
- 	m_actions.save.referenceAndText->setEnabled( displayWidget()->hasActiveAnchor() );
-
-  m_actions.print.reference->setEnabled( displayWidget()->hasActiveAnchor() );
-}
-
-/** Moves to the next book. */
-void CBibleReadWindow::nextBook(){
-	if (verseKey()->next(CSwordVerseKey::UseBook))
-		keyChooser()->setKey(key());
-}
-
-/** Moves one book behind. */
-void CBibleReadWindow::previousBook(){
-	if (verseKey()->previous(CSwordVerseKey::UseBook))
-		keyChooser()->setKey(key());
-}
-
-/** Moves to the next book. */
-void CBibleReadWindow::nextChapter(){
-	if (verseKey()->next(CSwordVerseKey::UseChapter))
-		keyChooser()->setKey(key());
-}
-
-/** Moves one book behind. */
-void CBibleReadWindow::previousChapter(){
-	if (verseKey()->previous(CSwordVerseKey::UseChapter))
-		keyChooser()->setKey(key());
-}
-
-/** Moves to the next book. */
-void CBibleReadWindow::nextVerse(){
-	if (verseKey()->next(CSwordVerseKey::UseVerse))
-		keyChooser()->setKey(key());
-}
-
-/** Moves one book behind. */
-void CBibleReadWindow::previousVerse(){
-	if (verseKey()->previous(CSwordVerseKey::UseVerse))
-		keyChooser()->setKey(key());
-}
-
-/** rapper around key() to return the right type of key. */
-CSwordVerseKey* CBibleReadWindow::verseKey(){
-//  qWarning("CBibleReadWindow::key()");
-	CSwordVerseKey* k = dynamic_cast<CSwordVerseKey*>(CDisplayWindow::key());
- 	Q_ASSERT(k);
-	return k;
-}
-
-/** Is called when the key of the keychooser changed. */
-void CBibleReadWindow::keyChanged(CSwordKey* key){
-/*	QWidgetList windows = mdi()->windowList();
-	if (!windows.count()) {
-		return;
-	}
-
-	for (windows.first(); windows.current(); windows.next()) {
-		CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(windows.current());
-		if (w && w->syncAllowed()) {
-			w->lookup( key->key() );
-		}
-	}*/
-}
-
-/** Copies the current chapter into the clipboard. */
-void CBibleReadWindow::copyDisplayedText(){
-//normal function
-  CSwordVerseKey vk(*verseKey());
-  CSwordVerseKey dummy(*verseKey());
-
-  dummy.Verse(1);
-//  qWarning("copyChapter: lower bound is %s", (const char*)dummy);
-  vk.LowerBound(dummy);
-
-  CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(modules().first());
-  dummy.Verse(bible->verseCount(dummy.book(), dummy.Chapter()));
-//  qWarning("copyChapter: upper bound is %s", (const char*)dummy);
-  vk.UpperBound(dummy);
-
-  CExportManager mgr(i18n("Copy chapter to clipboard ..."), false, i18n("Copying"), filterOptions(), displayOptions());
-  mgr.copyKey(&vk, CExportManager::Text, true);
-}
-
-/** Saves the chapter as valid HTML page. */
-void CBibleReadWindow::saveChapterHTML(){
-  //saves the complete chapter to disk
-
-	CSwordVerseKey dummy(*verseKey());
-  dummy.Verse(1);
-	qWarning("start saving from %s", dummy.key().latin1());
-
-  CSwordVerseKey vk(*verseKey());
-	vk.LowerBound(dummy);
-	qWarning("vk's start is %s", dummy.key().latin1());
-
-  CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(modules().first());
-	qWarning("verseCount for %s, chapter %i is %i", (const char*)dummy.book().local8Bit(), dummy.Chapter(), bible->verseCount(dummy.book(), dummy.Chapter()));
-	dummy.Verse(bible->verseCount(dummy.book(), dummy.Chapter()));
-
-	vk.UpperBound(dummy);
-
-  CExportManager mgr(i18n("Saving chapter ..."), true, i18n("Saving"), filterOptions(), displayOptions());
-  mgr.saveKey(&vk, CExportManager::HTML, true);
-}
-
-/** Saves the chapter as valid HTML page. */
-void CBibleReadWindow::saveChapterPlain(){
-  //saves the complete chapter to disk
-
-  CSwordVerseKey vk(*verseKey());
-  CSwordVerseKey dummy(*verseKey());
-
-  dummy.Verse(1);
-  vk.LowerBound(dummy);
-
-  CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(modules().first());
-  dummy.Verse(bible->verseCount(dummy.book(), dummy.Chapter()));
-  vk.UpperBound(dummy);
-
-  CExportManager mgr(i18n("Saving chapter ..."), true, i18n("Saving"), filterOptions(),displayOptions());
-  mgr.saveKey(&vk, CExportManager::Text, true);
-}
-
-void CBibleReadWindow::reload(){
-  CLexiconReadWindow::reload();
-
-	//refresh the book lists
-  verseKey()->setLocale( backend()->booknameLanguage().latin1() );
-  keyChooser()->refreshContent();
-}
-
-/** No descriptions */
-bool CBibleReadWindow::eventFilter( QObject* o, QEvent* e) {
-  const bool ret = CLexiconReadWindow::eventFilter(o,e);
-  if (e && (e->type() == QEvent::FocusIn)) { //sync other windows to this active
-
-		/* This is a hack to work around a KHTML problem (similair to the Drag&Drop problem we had):
-		* If new HTML content is loaded from inside a  kHTML event handler
-		* the widget's state will be confused, i.e. it's scrolling without having
-		* the mousebutton clicked.
-		*
-		* This is not really in a KHTML event handler but works anyway.
-		* Sometime KDE/Qt is hard to use ...
-		*/
-		QTimer::singleShot(0, this, SLOT(syncWindows()));
-	}
-
-	return ret;
-}
-
-void CBibleReadWindow::lookup( CSwordKey* newKey ) {
-	CLexiconReadWindow::lookup(newKey);
-
-	syncWindows();
-}
-
-void CBibleReadWindow::syncWindows() {
-	QWidgetList windows = mdi()->windowList();
-	if (!windows.count()) {
-		return;
-	}
-
-	for (windows.first(); windows.current(); windows.next()) {
-		CDisplayWindow* w = dynamic_cast<CDisplayWindow*>(windows.current());
-		if (w && w->syncAllowed()) {
-			w->lookup( key()->key() );
-		}
-	}
-}
diff --git a/bibletime/frontend/displaywindow/cbiblereadwindow.h b/bibletime/frontend/displaywindow/cbiblereadwindow.h
deleted file mode 100644
index ed702fa..0000000
--- a/bibletime/frontend/displaywindow/cbiblereadwindow.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/***************************************************************************
-                          cbiblereadwindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBIBLEREADWINDOW_H
-#define CBIBLEREADWINDOW_H
-
-//BibleTime includes
-#include "clexiconreadwindow.h"
-
-#include "backend/cswordkey.h"
-#include "backend/cswordversekey.h"
-
-//Qt includes
-#include <qwidget.h>
-
-//KDE includes
-#include <kaction.h>
-
-
-class CTransliterationButton;
-
-/**The read display window for Bibles.
-  *@author The BibleTime team
-  */
-
-class CBibleReadWindow : public CLexiconReadWindow  {
-   Q_OBJECT
-public: 
-	CBibleReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-	virtual ~CBibleReadWindow();
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* const settings );
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* const settings );
-  /**
-  * Reimplementation.
-  */
-  static void insertKeyboardActions( KAccel* const a );
-
-protected:
-	virtual void initKeyboardActions();
-  virtual void initConnections();
-  virtual void initView();
-  /**
-  * Reimplementation.
-  */
-  virtual void setupPopupMenu();
-  /**
-	* Reimplemented.
-	*/
-  virtual void updatePopupMenu();
-  /** Event filter.
-  * Reimplementation of the event filter to filter out events like focus in.
-  */
-  virtual bool eventFilter( QObject* o, QEvent* e);
-
-  struct {
-    KAction* selectAll;
-    KActionMenu* copyMenu;
-  	struct {
-			KAction* referenceOnly;
-   		KAction* referenceTextOnly;
-     	KAction* referenceAndText;
-      KAction* chapter;
-      KAction* selectedText;
-   	} copy;
-
-    KActionMenu* saveMenu;
-    struct {
-			KAction* referenceAndText;
-   		KAction* chapterAsPlain;
-     	KAction* chapterAsHTML;
-    } save;
-
-    KActionMenu* printMenu;
-    struct {
-			KAction* reference;
-			KAction* chapter;
-		} print;
-  } m_actions;
-
-
-public slots:
-  void nextBook();
-  void previousBook();
-  void nextChapter();
-  void previousChapter();
-  void nextVerse();
-  void previousVerse();
-  /**
-  * Refreshes the content of this display window and the content of the keychooser.
-  */
-  virtual void reload();
-     
-protected slots: // Protected slots 
-  void keyChanged(CSwordKey* key);
-  /**
-  * Copies the current chapter into the clipboard.
-  */
-  void copyDisplayedText();
-  /**
-  * Saves the chapter as valid HTML page.
-  */
-  void saveChapterHTML();
-  /**
-  * Saves the chapter as valid HTML page.
-  */
-  void saveChapterPlain();
-	virtual void lookup( CSwordKey* newKey );
-	void syncWindows();
-
-private:
-  friend class CCommentaryReadWindow;
-  /**
-  * Wrapper around key() to return the right type of key.
-  */
-  CSwordVerseKey* verseKey();
-
-  CTransliterationButton* m_transliterationButton;
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.cpp b/bibletime/frontend/displaywindow/cbookreadwindow.cpp
deleted file mode 100644
index 6507016..0000000
--- a/bibletime/frontend/displaywindow/cbookreadwindow.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/***************************************************************************
-                          cbookreadwindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cbookreadwindow.h"
-#include "cmodulechooserbar.h"
-#include "cbuttons.h"
-
-#include "backend/cswordtreekey.h"
-
-#include "frontend/display/cdisplay.h"
-#include "frontend/keychooser/cbooktreechooser.h"
-#include "frontend/cprofilewindow.h"
-
-#include "util/ctoolclass.h"
-#include "util/cresmgr.h"
-
-//Qt includes
-#include <qsplitter.h>
-
-//KDE includes
-#include <kaction.h>
-#include <klocale.h>
-
-CBookReadWindow::CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) : CLexiconReadWindow(modules, parent, name){
-}
-
-CBookReadWindow::~CBookReadWindow(){
-}
-
-void CBookReadWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-  CLexiconReadWindow::applyProfileSettings(profileWindow);
-
-	const bool enable = static_cast<bool>( profileWindow->windowSettings() );
-	if (enable) {
-    m_treeAction->activate();
-  }
-};
-
-void CBookReadWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-  CLexiconReadWindow::storeProfileSettings(profileWindow);
-
-  //store information about our show tree structure button
-	profileWindow->setWindowSettings( static_cast<int>( m_treeAction->isChecked() ) );
-};
-
-void CBookReadWindow::initKeyboardActions() {
-  CReadWindow::initKeyboardActions();
-};
-
-void CBookReadWindow::insertKeyboardActions( KAccel* /*a*/ ){
-//  CReadWindow::insertKeyboardActions(a);
-};
-
-/** No descriptions */
-void CBookReadWindow::initConnections(){
-	CLexiconReadWindow::initConnections();
- 	connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)),
- 		this, SLOT(lookup(CSwordKey*)));
- 	connect(m_treeChooser, SIGNAL(keyChanged(CSwordKey*)),
- 		keyChooser(), SLOT(updateKey(CSwordKey*)));
- 	connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)),
- 		m_treeChooser, SLOT(updateKey(CSwordKey*)));
-}
-
-/** Init the view */
-void CBookReadWindow::initView(){
-  QSplitter* splitter = new QSplitter(this);
-  setMainToolBar( new KToolBar(this) );
-	addDockWindow(mainToolBar());
-
-  setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
-	mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
- 	mainToolBar()->setFullSize(false);
-  
-  setModuleChooserBar( new CModuleChooserBar(modules(), modules().first()->type(), mainToolBar()) );
-	moduleChooserBar()->setButtonLimit(1);
-	mainToolBar()->insertWidget(1,moduleChooserBar()->sizeHint().width(),moduleChooserBar());
-
-  setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), mainToolBar()) );
-	mainToolBar()->insertWidget(2,displaySettingsButton()->size().width(),displaySettingsButton());
-  
-  m_treeAction = new KToggleAction(i18n("Toggle tree..."), CResMgr::displaywindows::bookWindow::toggleTree::icon, CResMgr::displaywindows::bookWindow::toggleTree::accel, this, SLOT(treeToggled()), actionCollection(), "treeToggle_action");
-	m_treeAction->plug(mainToolBar());
-
-	m_treeChooser = new CBookTreeChooser(modules(), key(), splitter);
-  setDisplayWidget( CDisplay::createReadInstance(this, splitter) ); 	 	
-
-  m_treeAction->setChecked(false);
-	m_treeChooser->hide();
-  	
-  splitter->setResizeMode(m_treeChooser, QSplitter::FollowSizeHint);
-  setCentralWidget( splitter );
-	setIcon(CToolClass::getIconForModule(modules().first()));
-}
-
-/** Is called when the action was executed to toggle the tree view. */
-void CBookReadWindow::treeToggled(){
-	if (m_treeAction->isChecked())
-		m_treeChooser->show();
-	else
-		m_treeChooser->hide();
-}
-
-/** Reimplementation to take care of the tree chooser. */
-void CBookReadWindow::modulesChanged(){
-  CLexiconReadWindow::modulesChanged();
-  m_treeChooser->setModules(modules());
-}
-
-
-//void CBookReadWindow::setupPopupMenu(){
-//	popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Lexicon window"));
-//
-// 	m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(selectAll()), actionCollection());
-//  m_actions.selectAll->plug(popup());
-//
-//  (new KActionSeparator())->plug( popup() );
-//
-// 	m_actions.copyMenu = new KActionMenu(i18n("Copy..."), ICON_EDIT_COPY);
-//
-//  m_actions.copy.reference = new KAction(i18n("Reference"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorOnly()), actionCollection());
-// 	m_actions.copyMenu->insert(m_actions.copy.reference);
-//
-//  m_actions.copy.entry = new KAction(i18n("Entry with text"), KShortcut(0), this, SLOT(copyDisplayedText()), actionCollection());
-// 	m_actions.copyMenu->insert(m_actions.copy.entry);
-//  m_actions.copyMenu->insert(new KActionSeparator());
-//	m_actions.copy.selectedText = new KAction(i18n("Selected text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copySelection()),actionCollection());
-// 	m_actions.copyMenu->insert(m_actions.copy.selectedText);
-// 	m_actions.copyMenu->plug(popup());
-//
-// 	m_actions.saveMenu = new KActionMenu(i18n("Save..."),ICON_FILE_SAVE);
-//	m_actions.save.entryAsPlain = new KAction(i18n("Entry as plain text"), KShortcut(0), this, SLOT(saveAsPlain()),actionCollection());
-// 	m_actions.saveMenu->insert(m_actions.save.entryAsPlain);
-// 	m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), this, SLOT(saveAsHTML()),actionCollection());
-// 	m_actions.saveMenu->insert(m_actions.save.entryAsHTML);
-// 	m_actions.saveMenu->plug(popup());
-//
-// 	m_actions.printMenu = new KActionMenu(i18n("Print..."),ICON_FILE_PRINT);
-// 	m_actions.print.reference = new KAction(i18n("Reference"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(printAnchorWithText()), actionCollection());
-// 	m_actions.printMenu->insert(m_actions.print.reference);
-//  m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(printAll()), actionCollection());
-// 	m_actions.printMenu->insert(m_actions.print.entry);
-// 	m_actions.printMenu->plug(popup());
-//}
-//
-///** Saves the displayed page as plain text. */
-//void CBookReadWindow::saveAsPlain(){
-//
-//}
-//
-///** Saves the current text as as HTML page. */
-//void CBookReadWindow::saveAsHTML(){
-//
-//}
diff --git a/bibletime/frontend/displaywindow/cbookreadwindow.h b/bibletime/frontend/displaywindow/cbookreadwindow.h
deleted file mode 100644
index 5d2c4fb..0000000
--- a/bibletime/frontend/displaywindow/cbookreadwindow.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/***************************************************************************
-                          cbookreadwindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBOOKREADWINDOW_H
-#define CBOOKREADWINDOW_H
-
-//BibleTime includes
-#include "clexiconreadwindow.h"
-#include "backend/cswordkey.h"
-#include "backend/cswordtreekey.h"
-#include "backend/cswordversekey.h"
-
-class KToggleAction;
-class CBookTreeChooser;
-
-/**
-  * @author The BibleTime team
-  */
-class CBookReadWindow : public CLexiconReadWindow  {
-  Q_OBJECT
-public:
-	static void insertKeyboardActions( KAccel* a );
-
-	CBookReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-	virtual ~CBookReadWindow();
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* profileWindow );
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* profileWindow );
-
-protected:
-	virtual void initKeyboardActions();
-  virtual void initConnections();
-  virtual void initView();
-
-//  virtual void setupPopupMenu();
-
-private:
-  KToggleAction* m_treeAction;
-  CBookTreeChooser* m_treeChooser;
-
-//  struct {
-//    KAction* selectAll;
-//    KActionMenu* copyMenu;
-//  	struct {
-//      KAction* reference;
-//			KAction* entry;
-//      KAction* selectedText;
-//   	} copy;
-//
-//    KActionMenu* saveMenu;
-//    struct {
-//      KAction* reference;
-//   		KAction* entryAsPlain;
-//     	KAction* entryAsHTML;
-//    } save;
-//
-//    KActionMenu* printMenu;
-//    struct {
-//      KAction* reference;
-//			KAction* entry;
-//		} print;
-//  } m_actions;
-
-private slots: // Private slots
-  /**
-  * Is called when the action was executed to toggle the tree view.
-  */
-  void treeToggled();
-
-protected slots: // Protected slots
-  /**
-  * Reimplementation to take care of the tree chooser.
-  */
-  virtual void modulesChanged();
-//  /**
-//   Saves the current text as as HTML page.
-//  */
-//  virtual void saveAsHTML();
-//  /**
-//   Saves the displayed page as plain text.
-//   */
-//  virtual void saveAsPlain();
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/cbuttons.cpp b/bibletime/frontend/displaywindow/cbuttons.cpp
deleted file mode 100644
index 55ab15a..0000000
--- a/bibletime/frontend/displaywindow/cbuttons.cpp
+++ /dev/null
@@ -1,212 +0,0 @@
-/***************************************************************************
-                          cbuttons.cpp  -  description
-                             -------------------
-    begin                : Sam Jul 13 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//HibleTime includes
-#include "cbuttons.h"
-
-#include "util/cresmgr.h"
-
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qtooltip.h>
-
-//KDE includes
-#include <kpopupmenu.h>
-#include <klocale.h>
-
-
-CTransliterationButton::CTransliterationButton(CSwordBackend::FilterOptions* filterOptions, QWidget *parent, const char *name )
- : KToolBarButton(CResMgr::displaywindows::transliteration::icon, 0,parent,name) {
- 	m_filterOptions = filterOptions;
-  m_filterOptions->transliteration = 0;
-
-  m_popup = new KPopupMenu(this);	
-	setPopup(m_popup);
-	setPopupDelay(0);
-
-	connect(m_popup, SIGNAL(activated(int)), this, SLOT(optionSelected(int)));
-	populateMenu();
-}
-
-CTransliterationButton::~CTransliterationButton(){
-
-}
-
-/** Resets the buttons with the list of used modules. */
-void CTransliterationButton::reset( ListCSwordModuleInfo& /*modules*/ ){
-  m_popup->clear();
-//  popuplateMenu();
-}
-
-/** Setup the menu entries. */
-void CTransliterationButton::populateMenu(){
-  m_popup->clear();
-  m_popup->insertTitle(i18n("Transliteration"));
-	m_popup->setCheckable(true);
-
-  if (!CPointers::backend()->useICU())
-    return;
-
-  Q_ASSERT(CPointers::backend()->transliterator());
-  if (!CPointers::backend()->transliterator())
-    return;
-
-  sword::StringList options = CPointers::backend()->transliterator()->getOptionValues();
-  sword::StringList::iterator it;
-
-  for (it = options.begin(); it != options.end(); ++it) {
-		int id = m_popup->insertItem(QString::fromLatin1((*it).c_str()));
-		if (m_filterOptions->transliteration == m_popup->indexOf(id)-1 ) { //workaround
-			m_popup->setItemChecked(id, true);
-		}
-  }
-}
-
-/** No descriptions */
-void CTransliterationButton::optionSelected(int ID){
-  for (unsigned int i = 0; i < m_popup->count(); i++)
- 		m_popup->setItemChecked(m_popup->idAt(i),false);	
- 	m_popup->setItemChecked(ID, true);
-	
-  m_filterOptions->transliteration = m_popup->indexOf( ID )-1; //workaround
-  emit sigChanged();
-}
-
-/************************************************
- *********** CDisplaySettingsButton *************
- ************************************************/
-
-CDisplaySettingsButton::CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *moduleSettings, const ListCSwordModuleInfo& useModules,QWidget *parent, const char *name )
-	: KToolBarButton(CResMgr::displaywindows::displaySettings::icon, 0, parent, name)
-{
-//  qWarning("CDisplaySettingsButton::CDisplaySettingsButton");
-	m_displaySettings = displaySettings;
-	m_moduleSettings = moduleSettings;
-	m_modules = useModules;
-
- 	m_popup = new KPopupMenu(this);	
-	setPopup(m_popup);
-	setPopupDelay(0);
-
-	connect(m_popup, SIGNAL(activated(int)), this, SLOT(optionToggled(int)));
-	populateMenu();
-}
-
-void CDisplaySettingsButton::reset(const ListCSwordModuleInfo& useModules){
-	m_modules = useModules;
-	populateMenu();
-//	if (!populateMenu())
-//		setEnabled(false);
-//	else
-//		setEnabled(true);
-}
-
-
-void CDisplaySettingsButton::optionToggled(int ID){
-	m_popup->setItemChecked( ID, !(m_popup->isItemChecked(ID)));
-	if (!m_popup->text(ID).isEmpty())
-	  *(m_dict[m_popup->text(ID)]) =  m_popup->isItemChecked(ID);
-	emit sigChanged();
-}
-
-/** No descriptions */
-int CDisplaySettingsButton::populateMenu(){
-//  qWarning("CDisplaySettingsButton::populateMenu");
-	int ret = 0;
-
-	m_popup->clear();
-	m_popup->insertTitle(i18n("Display options"));
-	m_popup->setCheckable(true);
-
-  ret += addMenuEntry(i18n("Use linebreaks after each verse"), &m_displaySettings->lineBreaks, (m_modules.first()->type() == CSwordModuleInfo::Bible));
-
-  //only show the verse numbers option for bible modules
-  ret += addMenuEntry(i18n("Show versenumbers"), &m_displaySettings->verseNumbers, (m_modules.first()->type() == CSwordModuleInfo::Bible));
-
-	ret += addMenuEntry(i18n("Show headings"),	&m_moduleSettings->headings,
-		isOptionAvailable(CSwordBackend::headings));	
-	ret += addMenuEntry(i18n("Show footnotes"), &m_moduleSettings->footnotes,
-		isOptionAvailable(CSwordBackend::footnotes ));
-	ret += addMenuEntry(i18n("Highlight words of Jesus"), &m_moduleSettings->redLetterWords,
-		isOptionAvailable(CSwordBackend::redLetterWords ));
-	ret += addMenuEntry(i18n("Show Strong's Numbers"), &m_moduleSettings->strongNumbers,
-		isOptionAvailable(CSwordBackend::strongNumbers ));
-
-	ret += addMenuEntry(i18n("Show morphologic tags"),&m_moduleSettings->morphTags,
-		isOptionAvailable(CSwordBackend::morphTags ));
-	ret += addMenuEntry(i18n("Show lemmas"),&m_moduleSettings->lemmas,
-		isOptionAvailable(CSwordBackend::lemmas ));
-	ret += addMenuEntry(i18n("Show Hebrew vowel points"), &m_moduleSettings->hebrewPoints,
-		isOptionAvailable(CSwordBackend::hebrewPoints ));
-	ret += addMenuEntry(i18n("Show Hebrew cantillation marks"), &m_moduleSettings->hebrewCantillation,
-		isOptionAvailable(CSwordBackend::hebrewCantillation ));
-	ret += addMenuEntry(i18n("Show Greek accents"), &m_moduleSettings->greekAccents,
-		isOptionAvailable(CSwordBackend::greekAccents ));
-	
-  ret += addMenuEntry(i18n("Use alternative textual variant"), &m_moduleSettings->textualVariants,
-		isOptionAvailable(CSwordBackend::textualVariants ));
-  ret += addMenuEntry(i18n("Show scripture cross-references"), &m_moduleSettings->scriptureReferences,
-		isOptionAvailable(CSwordBackend::scriptureReferences ));
-
-	QToolTip::add(this, i18n("Display settings"));
-
-
-	return ret;
-}
-
-/** No descriptions */
-int CDisplaySettingsButton::addMenuEntry( const QString name, const int* option, const bool available){
-	if (available){
-		m_dict.insert( name, option);
-		m_popup->setItemChecked(m_popup->insertItem( name ), *option );
-		return 1;
-	}
-	return 0;
-}
-
-bool CDisplaySettingsButton::isOptionAvailable( const CSwordBackend::FilterTypes option){
-	bool ret = false;
-	for (m_modules.first(); m_modules.current(); m_modules.next())
-		ret = ret || m_modules.current()->has(option);
-	return ret;
-}
-
-/** Returns the number of usable menu items in the setttings menu. */
-const int CDisplaySettingsButton::menuItemCount(){
-	return m_popup->count();
-}
-
-/** Sets the item at position pos to the satet given as 2nd paramter. */
-void CDisplaySettingsButton::setItemStatus( const int index, const bool checked ){
-	const int ID = m_popup->idAt(index);
-	m_popup->setItemChecked(ID, checked);
-	const QString text = m_popup->text(ID);
-	if (m_dict[text])
-	  *(m_dict[text]) = checked;
-}
-
-/** Returns the status of the item at position "index" */
-const bool CDisplaySettingsButton::itemStatus( const int index ){
-	return m_popup->isItemChecked( m_popup->idAt(index) );
-}
-
-/** Sets the status to changed. The signal changed will be emitted. */
-void CDisplaySettingsButton::setChanged(){
-	emit sigChanged();	
-}
diff --git a/bibletime/frontend/displaywindow/cbuttons.h b/bibletime/frontend/displaywindow/cbuttons.h
deleted file mode 100644
index 7a84c35..0000000
--- a/bibletime/frontend/displaywindow/cbuttons.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/***************************************************************************
-                          cbuttons.h  -  description
-                             -------------------
-    begin                : Sam Jul 13 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBUTTONS_H
-#define CBUTTONS_H
-
-//BibleTime includes
-#include "backend/cswordbackend.h"
-#include "backend/cswordmoduleinfo.h"
-
-//QT includes
-#include <qdict.h>
-
-//KDE includes
-#include <ktoolbarbutton.h>
-
-class KPopupMenu;
-
-/** This class manages the transliteration of the selected modules.
-  * @author The BibleTime team
-  */
-class CTransliterationButton : public KToolBarButton  {
-   Q_OBJECT
-public: 
-	CTransliterationButton(CSwordBackend::FilterOptions* displayOptions, QWidget *parent, const char *name=0);
-	~CTransliterationButton();
-  /**
-  * Setup the menu entries.
-  */
-  void populateMenu();
-  /**
-  * Resets the buttons with the list of used modules.
-  */
-  void reset( ListCSwordModuleInfo& modules );
-
-protected slots: // Protected slots
-  void optionSelected(int);
-
-private:
-  KPopupMenu* m_popup;
-  CSwordBackend::FilterOptions* m_filterOptions;
-
-signals:
-  void sigChanged();
-};
-
-/** This class manages the display options of the selected modules.
-  * @author The BibleTime team
-  */
-class CDisplaySettingsButton : public KToolBarButton  {
-   Q_OBJECT
-public:
-	CDisplaySettingsButton(CSwordBackend::DisplayOptions *displaySettings, CSwordBackend::FilterOptions *settings, const ListCSwordModuleInfo& useModules, QWidget *parent=0, const char *name=0);
-	void reset(const ListCSwordModuleInfo& useModules);
-  /**
-  * Sets the item at position pos to the satet given as 2nd paramter.
-  */
-  void setItemStatus( const int pos, const bool checked );
-  /**
-  * Returns the number of usable menu items in the setttings menu.
-  */
-  const int menuItemCount();
-  /**
-  * Returns the status of the item at position "index"
-  */
-  const bool itemStatus( const int index );
-  /**
-  * Sets the status to changed. The signal changed will be emitted.
-  */
-  void setChanged();
-
-signals:
-	void sigChanged(void);
-
-protected slots:
-	void optionToggled(int ID);
-
-protected:
-	CSwordBackend::FilterOptions*  m_moduleSettings;
-	CSwordBackend::DisplayOptions* m_displaySettings;
-	CSwordBackend::FilterOptions m_available;
-	ListCSwordModuleInfo m_modules;
-
-	QDict<int> m_dict;
-
-	KPopupMenu* m_popup;
-
-  int populateMenu();
-	bool isOptionAvailable( const CSwordBackend::FilterTypes option);
-  int addMenuEntry( const QString name, const int* option, const bool available);
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp b/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
deleted file mode 100644
index fd98ea6..0000000
--- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/***************************************************************************
-                          ccommentaryreadwindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "ccommentaryreadwindow.h"
-
-#include "frontend/cprofilewindow.h"
-#include "frontend/cbtconfig.h"
-#include "frontend/keychooser/ckeychooser.h"
-#include "frontend/display/cdisplay.h"
-#include "frontend/display/creaddisplay.h"
-
-#include "util/ctoolclass.h"
-#include "util/cresmgr.h"
-
-//Qt includes
-
-//KDE includes
-#include <kaction.h>
-#include <kaccel.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
-
-CCommentaryReadWindow::CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name) : CLexiconReadWindow(modules, parent,name) {
-}
-
-void CCommentaryReadWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-  CLexiconReadWindow::applyProfileSettings(profileWindow);
-  if (profileWindow->windowSettings())
-    m_syncButton->setChecked(true);
-};
-
-void CCommentaryReadWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-  CLexiconReadWindow::storeProfileSettings(profileWindow);
-  profileWindow->setWindowSettings( m_syncButton->isChecked() );
-};
-
-void CCommentaryReadWindow::initView(){
-	CLexiconReadWindow::initView();
-	m_syncButton = new KToggleAction(i18n("Sync with active bible"),
-		CResMgr::displaywindows::commentaryWindow::syncWindow::icon,
-		CResMgr::displaywindows::commentaryWindow::syncWindow::accel,
-		actionCollection(),
-		CResMgr::displaywindows::commentaryWindow::syncWindow::actionName
-	);
-	m_syncButton->setToolTip(CResMgr::displaywindows::commentaryWindow::syncWindow::tooltip); 	m_syncButton->setWhatsThis(CResMgr::displaywindows::commentaryWindow::syncWindow::whatsthis);
-  m_syncButton->plug(mainToolBar());
-}
-
-/** Reimplementation to handle the keychooser refresh. */
-void CCommentaryReadWindow::reload(){
-  CLexiconReadWindow::reload();
-
-	//refresh the book lists
-  verseKey()->setLocale( backend()->booknameLanguage().latin1() );
-  keyChooser()->refreshContent();
-}
-
-/** rapper around key() to return the right type of key. */
-CSwordVerseKey* CCommentaryReadWindow::verseKey(){
-//  qWarning("CCommentaryReadWindow::key()");
-	CSwordVerseKey* k = dynamic_cast<CSwordVerseKey*>(CDisplayWindow::key());
-// 	Q_ASSERT(k);
-	return k;
-}
-
-
-/** Reimplementation. */
-void CCommentaryReadWindow::insertKeyboardActions( KAccel* const a ){
-  a->insert("Next book",        i18n("Next book"),        "", CResMgr::displaywindows::bibleWindow::nextBook::accel, 0, "");
-	a->insert("Previous book",    i18n("Previous book"),    "", CResMgr::displaywindows::bibleWindow::previousBook::accel, 0, "");
-	a->insert("Next chapter",     i18n("Next chapter"),     "", CResMgr::displaywindows::bibleWindow::nextChapter::accel, 0, "");
-	a->insert("Previous chapter", i18n("Previous chapter"), "", CResMgr::displaywindows::bibleWindow::previousChapter::accel, 0, "");
-	a->insert("Next verse",       i18n("Next verse"),       "", CResMgr::displaywindows::bibleWindow::nextVerse::accel, 0, "");
-	a->insert("Previous verse",   i18n("Previous verse"),   "", CResMgr::displaywindows::bibleWindow::previousVerse::accel, 0, "");
-}
-
-void CCommentaryReadWindow::initKeyboardActions() {
-  CReadWindow::initKeyboardActions();
-
-  CBTConfig::setupAccel( CBTConfig::commentaryWindow, accel() );
-  CReadWindow::insertKeyboardActions(accel());  
-  insertKeyboardActions( accel() );
-
-  accel()->readSettings();
-
-	accel()->setSlot("Next book", this, SLOT(nextBook()));
-  accel()->setSlot("Previous book", this, SLOT(previousBook()));
-  accel()->setSlot("Next chapter", this, SLOT(nextChapter()));
-  accel()->setSlot("Previous chapter", this, SLOT(previousChapter()));
-  accel()->setSlot("Next verse", this, SLOT(nextVerse()));
-  accel()->setSlot("Previous verse", this, SLOT(previousVerse()));
-}
-
-/** Moves to the next book. */
-void CCommentaryReadWindow::nextBook(){
-	if (verseKey()->next(CSwordVerseKey::UseBook))
-		keyChooser()->setKey(key());
-}
-
-/** Moves one book behind. */
-void CCommentaryReadWindow::previousBook(){
-	if (verseKey()->previous(CSwordVerseKey::UseBook))
-		keyChooser()->setKey(key());
-}
-
-/** Moves to the next book. */
-void CCommentaryReadWindow::nextChapter(){
-	if (verseKey()->next(CSwordVerseKey::UseChapter))
-		keyChooser()->setKey(key());
-}
-
-/** Moves one book behind. */
-void CCommentaryReadWindow::previousChapter(){
-	if (verseKey()->previous(CSwordVerseKey::UseChapter))
-		keyChooser()->setKey(key());
-}
-
-/** Moves to the next book. */
-void CCommentaryReadWindow::nextVerse(){
-	if (verseKey()->next(CSwordVerseKey::UseVerse))
-		keyChooser()->setKey(key());
-}
-
-/** Moves one book behind. */
-void CCommentaryReadWindow::previousVerse(){
-	if (verseKey()->previous(CSwordVerseKey::UseVerse))
-		keyChooser()->setKey(key());
-}
-
-const bool CCommentaryReadWindow::syncAllowed() const {
-	return m_syncButton->isChecked();
-}
diff --git a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h b/bibletime/frontend/displaywindow/ccommentaryreadwindow.h
deleted file mode 100644
index fa02bba..0000000
--- a/bibletime/frontend/displaywindow/ccommentaryreadwindow.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
-                          ccommentaryreadwindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CCOMMENTARYREADWINDOW_H
-#define CCOMMENTARYREADWINDOW_H
-
-//BibleTime includes
-#include "cbiblereadwindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-/**
-  *@author The BibleTime team
-  */
-
-class CCommentaryReadWindow : public CLexiconReadWindow  {
-   Q_OBJECT
-public:
-  /**
-  * Reimplementation.
-  */
-  static void insertKeyboardActions( KAccel* const a );
-
-
-  CCommentaryReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* profileWindow );
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* profileWindow );
-	virtual const bool syncAllowed() const;
-
-public slots: // Public slots
-  void nextBook();
-  void previousBook();
-  void nextChapter();
-  void previousChapter();
-  void nextVerse();
-  void previousVerse();
-  /**
-  * Reimplementation to handle the keychooser refresh.
-  */
-  virtual void reload();
-
-protected:
-	virtual void initKeyboardActions();
-  virtual void initView();
-
-private:
-  KToggleAction* m_syncButton;
-  CSwordVerseKey* verseKey();
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.cpp b/bibletime/frontend/displaywindow/cdisplaywindow.cpp
deleted file mode 100644
index a832465..0000000
--- a/bibletime/frontend/displaywindow/cdisplaywindow.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-/***************************************************************************
-                          cdisplaywindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cdisplaywindow.h"
-#include "creadwindow.h"
-#include "cbiblereadwindow.h"
-#include "ccommentaryreadwindow.h"
-#include "clexiconreadwindow.h"
-#include "cbookreadwindow.h"
-
-#include "cwritewindow.h"
-#include "cplainwritewindow.h"
-#include "chtmlwritewindow.h"
-
-#include "cmodulechooserbar.h"
-#include "cbuttons.h"
-
-#include "backend/cswordkey.h"
-
-#include "frontend/keychooser/ckeychooser.h"
-
-#include "frontend/display/cdisplay.h"
-
-#include "frontend/cmdiarea.h"
-#include "frontend/cprofilewindow.h"
-#include "frontend/cbtconfig.h"
-
-
-//Qt includes
-
-//KDE includes
-#include <kaccel.h>
-
-CReadWindow* CDisplayWindow::createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name) {
-  switch (modules.first()->type()) {
-		case CSwordModuleInfo::Bible:
-			return new CBibleReadWindow(modules, parent, name);
-		case CSwordModuleInfo::Commentary:
-			return new CCommentaryReadWindow(modules, parent, name);
-		case CSwordModuleInfo::Lexicon:
-			return new CLexiconReadWindow(modules, parent, name);
-		case CSwordModuleInfo::GenericBook:			
-			return new CBookReadWindow(modules, parent, name);
-		default:
-			qWarning("unknown module type");
-			break;
- 	}
-  return 0;
-}
-
-
-CWriteWindow* CDisplayWindow::createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const CDisplayWindow::WriteWindowType& type,  const char* name) {
-  if (type == HTMLWindow) {
-    return new CHTMLWriteWindow(modules, parent, name);
-  }
-  else {
-    return new CPlainWriteWindow(modules, parent, name);
-  };
-  return 0;
-}
-
-CDisplayWindow::CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea *parent, const char *name )
-  : KMainWindow(parent, name, WDestructiveClose),
-    m_mdi(parent),
-//    m_modules(modules),
-    m_filterOptions(),
-    m_displayOptions(),
-    m_displaySettingsButton(0),    
-    m_keyChooser(0),
-    m_swordKey(0),    
-    m_isReady(false),    
-    m_moduleChooserBar(0),
-    m_mainToolBar(0),
-    m_popupMenu(0),
-    m_displayWidget(0)
-{
-//  qWarning("set modules now");
-  setModules(modules);
- // qWarning("modules setting done");
-}
-
-CDisplayWindow::~CDisplayWindow(){
-}
-
-CMDIArea* const CDisplayWindow::mdi() const {
-	return m_mdi;
-}
-
-/** Returns the right window caption. */
-const QString CDisplayWindow::windowCaption(){
- 	if (!m_modules.count())
-		return QString::null;
-
-//	QString ret = m_modules.first()->name();
-//	if (m_modules.count() > 1) {
-//		for (m_modules.next(); m_modules.current(); m_modules.next())	 {
-//			ret += " | " + m_modules.current();
-//		}
-//	}
-	return m_modules.join(" | ");
-}
-
-/** Returns the used modules as a QPtrList */
-ListCSwordModuleInfo CDisplayWindow::modules() {
-  ListCSwordModuleInfo mods;
-
-  for (QStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it) {
-    Q_ASSERT(backend()->findModuleByName(*it));
-    if (CSwordModuleInfo* m = backend()->findModuleByName(*it)) {
-      mods.append(m);
-    }
-  }
-  
-	return mods;
-}
-
-/** Set the window caption. */
-void CDisplayWindow::setCaption( const QString&  ){
-	QWidget::setCaption( windowCaption() );
-}
-
-void CDisplayWindow::insertKeyboardActions( KAccel* const /*accel*/ ) {
-}
-
-/** Is called when this window gets the focus or looses the focus. */
-void CDisplayWindow::windowActivated( const bool hasFocus ){
-	if (accel()) {
-		accel()->setEnabled(hasFocus);
-  }
-}
-
-/** Reimplementation from QWidget. Used to initialize things before the widget is shown. */
-void CDisplayWindow::polish(){
-//  qWarning("CDisplayWindow::polish()");
-  KMainWindow::polish();
-}
-
-/** Refresh the settings of this window. */
-void CDisplayWindow::reload() {
-  //first make sure all used Sword modules are still present
-  for (QStringList::iterator it = m_modules.begin(); it != m_modules.end(); ++it){
-    if (!backend()->findModuleByName(*it)) {
-      it = m_modules.remove(it);
-      if (it == m_modules.end()) {
-        break;
-      }
-    }
-  }
-
-	if (m_moduleChooserBar) { //necessary for edit windows which have now chooser bar
-  	m_moduleChooserBar->setModules(modules());
-	}
- 	modulesChanged();
-
-	if (m_modules.count() > 0) {
-    lookup();
-  }
-}
-
-/** Returns the filter options used by this window. */
-CSwordBackend::FilterOptions& CDisplayWindow::filterOptions() {
-	return m_filterOptions;
-}
-
-/** Returns the display options used by this display window. */
-CSwordBackend::DisplayOptions& CDisplayWindow::displayOptions() {
-	return m_displayOptions;
-}
-
-/** Sets the new display options for this window. */
-void CDisplayWindow::setDisplayOptions( const CSwordBackend::DisplayOptions& displayOptions ){
-	m_displayOptions = displayOptions;
-}
-
-/** Sets the new filter options of this window. */
-void CDisplayWindow::setFilterOptions( CSwordBackend::FilterOptions& filterOptions ){
-  m_filterOptions = filterOptions;
-}
-
-/** Returns true if the widget is ready for use. */
-const bool CDisplayWindow::isReady() const {
-	return m_isReady;
-}
-
-/** Set the ready status */
-void CDisplayWindow::setReady( const bool& ready ){
-	m_isReady = ready;
-}
-
-/** Returns true if the window may be closed. */
-bool CDisplayWindow::queryClose(){
-	return true;
-}
-
-/** Returns the keychooser widget of this display window. */
-CKeyChooser* const CDisplayWindow::keyChooser() const {
-	return m_keyChooser;
-}
-
-/** Sets the keychooser widget for this display window. */
-void CDisplayWindow::setKeyChooser( CKeyChooser* ck ){
-  m_keyChooser = ck;
-}
-
-/** Returns the key of this display window. */
-CSwordKey* CDisplayWindow::key() const {
-	return m_swordKey;
-}
-
-/** Sets the new sword key. */
-void CDisplayWindow::setKey( CSwordKey* key ){
-	m_swordKey = key;
-}
-
-void CDisplayWindow::modulesChanged(){
-	if (moduleChooserBar()) { //necessary for write windows
-		setModules( m_moduleChooserBar->getModuleList() );
-	}
-
-	if (!modules().count()) {
-  	close();
-  }
-  else {
-		if (displaySettingsButton()) {
-  		displaySettingsButton()->reset(modules());
-		}
-	  key()->module(modules().first());
-	  keyChooser()->setModules(modules());
-
-	  lookup(key());
-	}
-}
-
-/** Lookup the given key. */
-//void CDisplayWindow::lookup( CSwordKey* ){
-//}
-
-/** Returns the module chooser bar. */
-CModuleChooserBar* const CDisplayWindow::moduleChooserBar() const {
-	return m_moduleChooserBar;
-}
-
-/** Sets the module chooser bar. */
-void CDisplayWindow::setModuleChooserBar( CModuleChooserBar* bar ){
-	if (m_moduleChooserBar) {
- 		disconnect(m_moduleChooserBar, SIGNAL(sigChanged()), this, SLOT(modulesChanged()));
-  }
-
-	if (bar) { //if a new bar should be set!
-    m_moduleChooserBar = bar;
-  	connect(bar, SIGNAL(sigChanged()), SLOT(modulesChanged()));
-  };
-}
-
-/** Sets the modules. */
-void CDisplayWindow::setModules( ListCSwordModuleInfo newModules ){
-  m_modules.clear();
-  for (newModules.first(); newModules.current(); newModules.next()) {
-    m_modules.append(newModules.current()->name());
-  }
-}
-
-/** Initialize the window. Call this method from the outside, because calling this in the constructor is not possible! */
-const bool CDisplayWindow::init( const QString& keyName ){
-  initView();
-  setMinimumSize( 350,300 );
-
-  setCaption(windowCaption());
-  //setup focus stuff.
-  setFocusPolicy(QWidget::ClickFocus);
-  parentWidget()->setFocusPolicy(QWidget::ClickFocus);
-
-  show();
- 	initConnections();
-  initKeyboardActions();
- 	setupPopupMenu();
-  
-  m_filterOptions = CBTConfig::getFilterOptionDefaults();
-	m_displayOptions = CBTConfig::getDisplayOptionDefaults();
-	if (displaySettingsButton()) { 
-		displaySettingsButton()->reset(modules());
-  }
-
-  if (key()) {
-    key()->key(keyName);
-  }
-
-  return true;
-}
-
-/** Returns the main toolbar. */
-KToolBar* const CDisplayWindow::mainToolBar() const{
-  return m_mainToolBar;
-}
-
-/** Sets the main toolbar. */
-void CDisplayWindow::setMainToolBar( KToolBar* bar ){
-	m_mainToolBar = bar;
-}
-
-/** Returns the display settings button */
-CDisplaySettingsButton* const CDisplayWindow::displaySettingsButton() const{
-  return m_displaySettingsButton;
-}
-
-/** Sets the display settings button. */
-void CDisplayWindow::setDisplaySettingsButton( CDisplaySettingsButton* button ){
-  if (m_displaySettingsButton)
-		disconnect(m_displaySettingsButton, SIGNAL( sigChanged() ),this,	SLOT(lookup() ));
-
-  m_displaySettingsButton = button;
- 	connect(m_displaySettingsButton, SIGNAL(sigChanged()),this, SLOT(lookup()));
-}
-
-/** Lookup the current key. Used to refresh the display. */
-void CDisplayWindow::lookup(){
- 	lookup( key() );
-}
-
-void CDisplayWindow::lookup( const QString& moduleName, const QString& keyName ) {
-  if (!isReady())
-  	return;
-
-	CSwordModuleInfo* m = backend()->findModuleByName(moduleName);
-  if (!m) {
-    return;
-	}
-
-	if (m && modules().containsRef(m) && !keyName.isEmpty()) {
-		key()->key(keyName);
-		keyChooser()->setKey(key()); //the key chooser does send an update signal
-	}
-	else { //given module not chosen by user
-
-		//if the module is displayed in another display window we assume a wrong drop
-		QWidgetList windows = mdi()->windowList();
-  	bool found = false;
-		CDisplayWindow* dw = 0;
-  	for (windows.first(); windows.current(); windows.next()) {
-    	dw = dynamic_cast<CDisplayWindow*>(windows.current());
-     	if (dw && dw->modules().containsRef(m)) {
-				found = true;
-				break;
-			}
-		}
-
-		if (found) { //lookup in the window which has the module displayed
-			dw->lookup(moduleName, keyName);
-  	}
-		else { //create a new window for the given module
-    	ListCSwordModuleInfo mList;
-     	mList.append(m);
-			mdi()->emitCreateDisplayWindow(mList, keyName);
-  	}
-	}
-}
-
-void CDisplayWindow::lookup( const QString& key ) {
-	lookup(modules().first()->name(), key);
-}
-
-/** Update the status of the popup menu entries. */
-void CDisplayWindow::updatePopupMenu(){
-
-}
-
-
-///** Returns the installed popup menu. */
-KPopupMenu* const CDisplayWindow::popup(){
-//	qWarning("CReadWindow::popup()");
-	if (!m_popupMenu) {
- 		m_popupMenu = new KPopupMenu(this);
-		connect(m_popupMenu, SIGNAL(aboutToShow()), this, SLOT(updatePopupMenu()));
-	  if (displayWidget()) {
-	  	displayWidget()->installPopup(m_popupMenu);
-    }
-	  else {
-	  	qWarning("CDisplayWindow:: can't instal popup menu");
-    }
-  }
- 	return m_popupMenu;
-}
-
-/** Returns the display widget used by this implementation of CDisplayWindow. */
-CDisplay* const CDisplayWindow::displayWidget() const {
-  return m_displayWidget;
-}
-
-/** Sets the display widget used by this display window. */
-void CDisplayWindow::setDisplayWidget( CDisplay* newDisplay ){
-  m_displayWidget = newDisplay;
-}
-
-void CDisplayWindow::closeEvent(QCloseEvent* e) {
-//  qWarning("CDisplayWindow::closeEvent(QCloseEvent* e)");
-	if (!queryClose()) {
-		e->ignore();
-	}
-	else {
-		e->accept();
-	}
-}
diff --git a/bibletime/frontend/displaywindow/cdisplaywindow.h b/bibletime/frontend/displaywindow/cdisplaywindow.h
deleted file mode 100644
index 3639984..0000000
--- a/bibletime/frontend/displaywindow/cdisplaywindow.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/***************************************************************************
-                          cdisplaywindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CDISPLAYWINDOW_H
-#define CDISPLAYWINDOW_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbackend.h"
-#include "backend/cswordkey.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordtreekey.h"
-#include "backend/cswordldkey.h"
-
-//Qt includes
-#include <qwidget.h>
-
-//KDE includes
-#include <kmainwindow.h>
-
-
-class CMDIArea;
-class CReadWindow;
-class CWriteWindow;
-class CMDIArea;
-class CProfileWindow;
-class KAccel;
-class CDisplaySettingsButton;
-class CDisplay;
-class CKeyChooser;
-class CModuleChooserBar;
-class CDisplaySettingsButton;
-class KToolBar;
-class KPopupMenu;
-
-/** The base class for all display windows of BibleTime.
-  * @author The BibleTime team
-  */
-
-class CDisplayWindow : public KMainWindow, public CPointers  {
-   Q_OBJECT
-public:
-  enum WriteWindowType {
-    HTMLWindow = 1,
-    PlainTextWindow = 2
-  };
-
-  static CReadWindow* createReadInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const char* name = 0);
-	static CWriteWindow* createWriteInstance(ListCSwordModuleInfo modules, CMDIArea* parent, const WriteWindowType& type = HTMLWindow, const char* name = 0);
-  /**
-  * Insert the keyboard accelerators of this window into the given KAccel object.
-  */
-  static void insertKeyboardActions( KAccel* const accel );
-
- 	CMDIArea* const mdi() const;
-  /**
-  * Returns the right window caption.
-  */
-  const QString windowCaption();
-  /**
-  * Returns the used modules as a QPtrList
-  */
-  ListCSwordModuleInfo modules();
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* profileWindow ) = 0;
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* profileWindow ) = 0;
-  /**
-  * Set the window caption.
-  */
-  virtual void setCaption( const QString& );
-  /**
-  * Sets the new filter options of this window.
-  */
-  void setFilterOptions( CSwordBackend::FilterOptions& filterOptions );
-  /**
-  * Sets the new display options for this window.
-  */
-  void setDisplayOptions( const CSwordBackend::DisplayOptions& displayOptions );
-  /**
-  * Returns the display options used by this display window.
-  */
-  CSwordBackend::DisplayOptions& displayOptions();
-  /**
-  * Returns the filter options used by this window.
-  */
-  CSwordBackend::FilterOptions& filterOptions();
-  /**
-  * Set the ready status
-  */
-  void setReady( const bool& ready );
-  /**
-  * Returns true if the widget is ready for use.
-  */
-  const bool isReady() const;
-  /**
-  * Returns true if the window may be closed.
-  */
-  virtual bool queryClose();
-  /**
-  * Returns the keychooser widget of this display window.
-  */
-  CKeyChooser* const keyChooser() const;
-  /**
-  * Sets the new sword key.
-  */
-  void setKey( CSwordKey* key );
-  /**
-  * Returns the key of this display window.
-  */
-  CSwordKey* key() const;
-  /**
-  * Initialize the window. Call this method from the outside, because calling this in the constructor is not possible!
-  */
-  virtual const bool init( const QString& key );
-  /**
-  * Sets the main toolbar.
-  */
-  void setMainToolBar( KToolBar* bar );
-  /**
-  * Returns the main toolbar.
-  */
-  KToolBar* const mainToolBar() const;
-  /**
-  * Returns the display settings button
-  */
-  CDisplaySettingsButton* const displaySettingsButton() const;
-  /**
-  * Sets the display settings button.
-  */
-  void setDisplaySettingsButton( CDisplaySettingsButton* button );
-  virtual void setupPopupMenu() = 0;
-  /**
-  * Returns the display widget used by this implementation of CDisplayWindow.
-  */
-  virtual CDisplay* const displayWidget() const;
-  /**
-  * Sets the display widget used by this display window.
-  */
-  virtual void setDisplayWidget( CDisplay* newDisplay );
-
-	/* Returns whether syncs to the active window are allowed at this time for this display window
-	* @return boolean value whether sync is allowed
-	*/
-	virtual const bool syncAllowed() const {
-		return false;
-	};
-
-public slots:
-  /**
-  * Lookup the specified key in the given module. If the module is not chosen withing
-  * this display window create a new displaywindow with the right module in it.
-  */
-  virtual void lookup( const QString& module, const QString& key );
-  /**
-  * Lookup the key in the chosen modules.
-  */
-  virtual void lookup( const QString& key );
-  /**
-  * Refresh the settings of this window.
-  */
-  virtual void reload();
-
-protected:
-	friend class CMDIArea;
-	friend class CBibleReadWindow;
-
-	CDisplayWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-	virtual ~CDisplayWindow();
-  /**
-  * Initializes the intern keyboard actions.
-  */
-  virtual void initKeyboardActions() = 0;
-  /**
-   Is called when this window gets the focus or looses the focus.
-  */
-  virtual void windowActivated( const bool hasFocus );
-  /**
-  * Sets the keychooser widget for this display window.
-  */
-  void setKeyChooser( CKeyChooser* ck );
-  /**
-  * Returns the module chooser bar.
-  */
-  CModuleChooserBar* const moduleChooserBar() const;
-  /**
-  * Lookup the given key.
-  */
-  virtual void lookup( CSwordKey* ) = 0;
-  /**
-  * Sets the module chooser bar.
-  */
-  void setModuleChooserBar( CModuleChooserBar* bar );
-  /**
-  * Sets the modules.
-  */
-  void setModules( ListCSwordModuleInfo modules );
-  /**
-  * Initializes the signal / slot connections of this display window.
-  */
-  virtual void initConnections() = 0;
-  /**
-  * Initialize the view of this display window.
-  */
-  virtual void initView() = 0;
-  /**
-  * Returns the installed popup menu.
-  */
-  KPopupMenu* const popup();
-  virtual void closeEvent(QCloseEvent* e);
-  
-protected slots:
-	virtual void modulesChanged();
-  /**
-  * Lookup the current key. Used to refresh the display.
-  */
-  void lookup();
-  /**
-  * Reimplementation from QWidget. Used to initialize things before this widget is shown.
-  */
-  virtual void polish();
-  virtual void updatePopupMenu();
-  
-private:
-	CMDIArea* m_mdi;
-
-	//we may only cache the module names bacause after a backend relaod the pointers are invalid!
-  QStringList m_modules;
-  
-  CSwordBackend::FilterOptions m_filterOptions;
-	CSwordBackend::DisplayOptions m_displayOptions;
-  CDisplaySettingsButton* m_displaySettingsButton;
-  CKeyChooser* m_keyChooser;
-  CSwordKey* m_swordKey;
-  bool m_isReady;
-  CModuleChooserBar* m_moduleChooserBar;
-  KToolBar* m_mainToolBar;
-  KPopupMenu* m_popupMenu;
-  CDisplay* m_displayWidget;
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp b/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
deleted file mode 100644
index 5cb3f08..0000000
--- a/bibletime/frontend/displaywindow/chtmlwritewindow.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/***************************************************************************
-                          chtmlwritewindow.cpp  -  description
-                             -------------------
-    begin                : Fre Nov 29 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "chtmlwritewindow.h"
-
-//frontend includes
-#include "frontend/keychooser/ckeychooser.h"
-#include "frontend/cprofilewindow.h"
-
-#include "util/cresmgr.h"
-
-//Qt includes
-
-//KDE includes
-#include <kaction.h>
-#include <klocale.h>
-
-
-CHTMLWriteWindow::CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name)
-  : CPlainWriteWindow(modules, parent, name)
-{
-
-}
-
-CHTMLWriteWindow::~CHTMLWriteWindow(){
-
-}
-
-//void CHTMLWriteWindow::setupPopupMenu() {
-//
-//};
-
-void CHTMLWriteWindow::initView() {
-  CWriteDisplay* writeDisplay = CDisplay::createWriteInstance(this, CDisplay::HTMLDisplay);
-  Q_ASSERT(writeDisplay);
- 	setDisplayWidget( writeDisplay );
- 	setCentralWidget( displayWidget()->view() );
-
-  setMainToolBar( new KToolBar(this) );
-  mainToolBar()->setFullSize(true);
-	addDockWindow(mainToolBar());
-
-	setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
-	mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
- 	mainToolBar()->setFullSize(false);
-
-
-  //setip the toolbar
-	m_actions.syncWindow = new KToggleAction(i18n("Sync with active bible"),
-		CResMgr::displaywindows::commentaryWindow::syncWindow::icon,
-		CResMgr::displaywindows::commentaryWindow::syncWindow::accel,
-		actionCollection(),
-		CResMgr::displaywindows::commentaryWindow::syncWindow::actionName
-	);
-	m_actions.syncWindow->setToolTip(CResMgr::displaywindows::commentaryWindow::syncWindow::tooltip); m_actions.syncWindow->setWhatsThis(CResMgr::displaywindows::commentaryWindow::syncWindow::whatsthis);
-  m_actions.syncWindow->plug(mainToolBar());
-
-	m_actions.saveText = new KAction( i18n("Save text"),
-    CResMgr::displaywindows::writeWindow::saveText::icon,
-    CResMgr::displaywindows::writeWindow::saveText::accel,
-    this, SLOT( saveCurrentText()  ),
-    actionCollection(),
-		CResMgr::displaywindows::writeWindow::saveText::actionName
-  );
-  m_actions.saveText->setToolTip( CResMgr::displaywindows::writeWindow::saveText::tooltip );
-  m_actions.saveText->setWhatsThis( CResMgr::displaywindows::writeWindow::saveText::whatsthis );
-  m_actions.saveText->plug(mainToolBar());
-
- 	m_actions.deleteEntry = new KAction(i18n("Delete current entry"),
-    CResMgr::displaywindows::writeWindow::deleteEntry::icon,
-    CResMgr::displaywindows::writeWindow::deleteEntry::accel,
-    this, SLOT(deleteEntry()),
-    actionCollection(),
-		CResMgr::displaywindows::writeWindow::deleteEntry::actionName
-  );
-  m_actions.deleteEntry->setToolTip( CResMgr::displaywindows::writeWindow::deleteEntry::tooltip );
-  m_actions.deleteEntry->setWhatsThis( CResMgr::displaywindows::writeWindow::deleteEntry::whatsthis );
-  m_actions.deleteEntry->plug(mainToolBar());
-
-
- 	m_actions.restoreText = new KAction(i18n("Restore original text"),
-    CResMgr::displaywindows::writeWindow::restoreText::icon,
-    CResMgr::displaywindows::writeWindow::restoreText::accel,
-    this, SLOT(restoreText()), actionCollection(),
-		CResMgr::displaywindows::writeWindow::restoreText::actionName
-  );
-  m_actions.restoreText->setToolTip( CResMgr::displaywindows::writeWindow::restoreText::tooltip );
-  m_actions.restoreText->setWhatsThis( CResMgr::displaywindows::writeWindow::restoreText::whatsthis );
-  m_actions.restoreText->plug(mainToolBar());
-
-
-  KToolBar* bar = new KToolBar(this);
-  bar->setFullSize(true);
-	addDockWindow(bar);
-
-  writeDisplay->setupToolbar( bar, actionCollection() );
-};
-
-void CHTMLWriteWindow::initConnections() {
-	CWriteWindow::initConnections();
-	
- 	connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)),
-		this, SLOT(lookup(CSwordKey*)));
-  connect(displayWidget()->connectionsProxy(), SIGNAL(textChanged()),
-    this, SLOT(textChanged()) );
-};
-
-void CHTMLWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-  CWriteWindow::storeProfileSettings(profileWindow);
-  profileWindow->setWindowSettings( m_actions.syncWindow->isChecked() );
-};
-
-void CHTMLWriteWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-  CWriteWindow::applyProfileSettings(profileWindow);
-  if (profileWindow->windowSettings()) {
-    m_actions.syncWindow->setChecked(true);
-	}
-};
-
-/** Is called when the current text was changed. */
-void CHTMLWriteWindow::textChanged() {
-  m_actions.saveText->setEnabled( displayWidget()->isModified() );
-  m_actions.restoreText->setEnabled( displayWidget()->isModified() );
-}
-
-/** Loads the original text from the module. */
-void CHTMLWriteWindow::restoreText(){
-  lookup(key());
-  displayWidget()->setModified(false);
-  textChanged();
-}
-
-const bool CHTMLWriteWindow::syncAllowed() const {
-	return m_actions.syncWindow->isChecked();
-}
diff --git a/bibletime/frontend/displaywindow/chtmlwritewindow.h b/bibletime/frontend/displaywindow/chtmlwritewindow.h
deleted file mode 100644
index 7b85434..0000000
--- a/bibletime/frontend/displaywindow/chtmlwritewindow.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/***************************************************************************
-                          chtmlwritewindow.h  -  description
-                             -------------------
-    begin                : Fre Nov 29 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CHTMLWRITEWINDOW_H
-#define CHTMLWRITEWINDOW_H
-
-//BibleTime includes
-#include "cplainwritewindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-class KAction;
-
-/** The WYSIWYG implementation of the editor.
-  * @author The BibleTime team
-  */
-class CHTMLWriteWindow : public CPlainWriteWindow  {
-   Q_OBJECT
-public:
-	CHTMLWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name = 0);
-	virtual ~CHTMLWriteWindow();
-
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* );
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* );
-
-	virtual const bool syncAllowed() const;
-
-protected: // Protected methods
-  /**
-  * Initialize the state of this widget.
-  */
-  virtual void initView();
-  virtual void initConnections();
-  virtual const CDisplayWindow::WriteWindowType writeWindowType() {
-    return CDisplayWindow::HTMLWindow;
-  };
-
-protected slots:
-  /**
-  * Is called when the current text was changed.
-  */
-  virtual void textChanged();
-  /**
-  * Loads the original text from the module.
-  */
-  virtual void restoreText();
-
-private:
-  struct {
-    KAction* saveText;
-    KAction* restoreText;
-    KAction* deleteEntry;
-		KToggleAction* syncWindow;
-  } m_actions;
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp b/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
deleted file mode 100644
index c802cf1..0000000
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-/***************************************************************************
-                          clexiconreadwindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "clexiconreadwindow.h"
-#include "cmodulechooserbar.h"
-#include "cbuttons.h"
-
-#include "backend/cswordkey.h"
-#include "backend/cswordldkey.h"
-
-#include "frontend/cbtconfig.h"
-#include "frontend/cexportmanager.h"
-#include "frontend/display/cdisplay.h"
-#include "frontend/display/creaddisplay.h"
-#include "frontend/keychooser/ckeychooser.h"
-
-#include "util/ctoolclass.h"
-#include "util/cresmgr.h"
-
-//Qt includes
-
-//KDE includes
-#include <kaccel.h>
-#include <ktoolbar.h>
-#include <klocale.h>
-#include <kpopupmenu.h>
-
-CLexiconReadWindow::CLexiconReadWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name) : CReadWindow(moduleList, parent,name) {
-	setKey( CSwordKey::createInstance(moduleList.first()) );
-// 	key()->key("");
-}
-
-CLexiconReadWindow::~CLexiconReadWindow(){
-}
-
-void CLexiconReadWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-	CReadWindow::applyProfileSettings(profileWindow);
-};
-
-void CLexiconReadWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-	CReadWindow::storeProfileSettings(profileWindow);
-};
-
-/** Reimplementation. */
-void CLexiconReadWindow::insertKeyboardActions( KAccel* a ){
-  a->insert("Next entry",     i18n("Next entry"),     "", CResMgr::displaywindows::lexiconWindow::nextEntry::accel, 0, "", true, true);
-	a->insert("Previous entry", i18n("Previous entry"), "", CResMgr::displaywindows::lexiconWindow::previousEntry::accel, 0, "", true, true);	
-}
-
-void CLexiconReadWindow::initKeyboardActions() {
-  CReadWindow::initKeyboardActions();
-
-  CBTConfig::setupAccel(CBTConfig::lexiconWindow, accel());
-  insertKeyboardActions(accel());
-  CReadWindow::insertKeyboardActions(accel());
-
-  accel()->readSettings();
-
-  accel()->setSlot("Next entry", this, SLOT(nextEntry()));
-  accel()->setSlot("Previous entry",  this, SLOT(previousEntry()));
-};
-
-/** No descriptions */
-void CLexiconReadWindow::initConnections(){
- 	connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)),
-		this, SLOT(lookup(CSwordKey*)));
-}
-
-void CLexiconReadWindow::initView(){
-	setDisplayWidget( CDisplay::createReadInstance(this) );
- 	setCentralWidget( displayWidget()->view() );
-
-  setMainToolBar( new KToolBar(this) );
-  mainToolBar()->setFullSize(true);
-	addDockWindow(mainToolBar());
-
-	setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
-	mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
- 	mainToolBar()->setFullSize(false);
-
-	setModuleChooserBar( new CModuleChooserBar(modules(), modules().first()->type(), mainToolBar()) );
-	mainToolBar()->insertWidget(1,moduleChooserBar()->sizeHint().width(),moduleChooserBar());
-
-//  setDisplaySettingsButton( new CDisplaySettingsButton( &displayOptions(), &filterOptions(), modules(), mainToolBar()) );
-//	mainToolBar()->insertWidget(2,displaySettingsButton()->size().width(),displaySettingsButton());
-
-  setIcon(CToolClass::getIconForModule(modules().first()));
-}
-
-void CLexiconReadWindow::setupPopupMenu(){
-	popup()->insertTitle(CToolClass::getIconForModule(modules().first()), i18n("Lexicon window"));
-
- 	m_actions.selectAll = new KAction(i18n("Select all"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(selectAll()), actionCollection());
-  m_actions.selectAll->plug(popup());
-
-  (new KActionSeparator())->plug( popup() );
-
- 	m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::displaywindows::lexiconWindow::copyMenu::icon);
-
-  m_actions.copy.reference = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorOnly()), actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.reference);
-  m_actions.copy.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copyAnchorWithText()), actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.entry);
-  m_actions.copyMenu->insert(new KActionSeparator());
-	m_actions.copy.selectedText = new KAction(i18n("Selected text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(copySelection()),actionCollection());
- 	m_actions.copyMenu->insert(m_actions.copy.selectedText);
- 	m_actions.copyMenu->plug(popup());
-
- 	m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::displaywindows::lexiconWindow::saveMenu::icon);	
-	m_actions.save.entryAsPlain = new KAction(i18n("Entry as plain text"), KShortcut(0), this, SLOT(saveAsPlain()),actionCollection());
- 	m_actions.saveMenu->insert(m_actions.save.entryAsPlain);
- 	m_actions.save.entryAsHTML = new KAction(i18n("Entry as HTML"), KShortcut(0), this, SLOT(saveAsHTML()),actionCollection());
- 	m_actions.saveMenu->insert(m_actions.save.entryAsHTML);
- 	m_actions.saveMenu->plug(popup());
-
- 	m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::displaywindows::lexiconWindow::printMenu::icon);	
- 	m_actions.print.reference = new KAction(i18n("Reference only"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(printAnchorWithText()), actionCollection());
- 	m_actions.printMenu->insert(m_actions.print.reference); 	 	
-  m_actions.print.entry = new KAction(i18n("Entry with text"), KShortcut(0), displayWidget()->connectionsProxy(), SLOT(printAll()), actionCollection());
- 	m_actions.printMenu->insert(m_actions.print.entry); 	
- 	m_actions.printMenu->plug(popup());
-}
-
-/** Reimplemented. */
-void CLexiconReadWindow::updatePopupMenu(){
- 	m_actions.copy.reference->setEnabled( displayWidget()->hasActiveAnchor() );
-	m_actions.copy.selectedText->setEnabled( displayWidget()->hasSelection() );
-
- 	m_actions.print.reference->setEnabled( displayWidget()->hasActiveAnchor() );
-}
-
-/** No descriptions */
-void CLexiconReadWindow::nextEntry(){
-  keyChooser()->setKey(ldKey()->NextEntry());
-}
-
-/** No descriptions */
-void CLexiconReadWindow::previousEntry(){
-  keyChooser()->setKey(ldKey()->PreviousEntry());
-}
-
-/** Reimplementation to return the right key. */
-CSwordLDKey* CLexiconReadWindow::ldKey(){
-  return dynamic_cast<CSwordLDKey*>(CDisplayWindow::key());
-}
-
-/** This function saves the entry as html using the CExportMgr class. */
-void CLexiconReadWindow::saveAsHTML(){
-  CExportManager mgr(i18n("Saving entry ..."), true, i18n("Saving"), filterOptions(), displayOptions());
-  mgr.saveKey(key(), CExportManager::HTML, true);  
-}
-
-/** This function saves the entry as html using the CExportMgr class. */
-void CLexiconReadWindow::saveAsPlain(){
-  CExportManager mgr(i18n("Saving entry ..."), true, i18n("Saving"), filterOptions(), displayOptions());
-  mgr.saveKey(key(), CExportManager::Text, true);
-}
diff --git a/bibletime/frontend/displaywindow/clexiconreadwindow.h b/bibletime/frontend/displaywindow/clexiconreadwindow.h
deleted file mode 100644
index 1bc9c4f..0000000
--- a/bibletime/frontend/displaywindow/clexiconreadwindow.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************
-                          clexiconreadwindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CLEXICONREADWINDOW_H
-#define CLEXICONREADWINDOW_H
-
-//BibleTime includes
-#include "creadwindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-//KDE includes
-#include <kaction.h>
-
-class CSwordKey;
-class CSwordLDKey;
-/**
-  *@author The BibleTime team
-  */
-
-class CLexiconReadWindow : public CReadWindow  {
-   Q_OBJECT
-public: 
-	CLexiconReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-	virtual ~CLexiconReadWindow();
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* profileWindow );
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* profileWindow );
-  /**
-  * Reimplementation.
-  */
-  static void insertKeyboardActions( KAccel* a );
-
-protected:
-	virtual void initKeyboardActions();
-  virtual void initConnections();
-  virtual void initView();
-  virtual void updatePopupMenu();
-  virtual void setupPopupMenu();
-
-private:
-  /**
-  * Reimplementation to return the right key.
-  */
-  CSwordLDKey* ldKey();
-
-  struct {
-    KAction* selectAll;
-    KActionMenu* copyMenu;
-  	struct {
-      KAction* reference;
-			KAction* entry;
-      KAction* selectedText;
-   	} copy;
-
-    KActionMenu* saveMenu;
-    struct {
-      KAction* reference;
-   		KAction* entryAsPlain;
-     	KAction* entryAsHTML;
-    } save;
-
-    KActionMenu* printMenu;
-    struct {
-      KAction* reference;
-			KAction* entry;
-		} print;
-  } m_actions;
-
-protected slots: // Protected slots
-  void previousEntry();
-  void nextEntry();
-  /**
-  * This function saves the entry as html using the CExportMgr class.
-  */
-  void saveAsHTML();
-  /**
-  * This function saves the entry as plain text using the CExportMgr class.
-  */
-  void saveAsPlain();
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp b/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
deleted file mode 100644
index 69b7f1d..0000000
--- a/bibletime/frontend/displaywindow/cmodulechooserbar.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/***************************************************************************
-                          cmodulechooserbar.cpp  -  description
-                             -------------------
-    begin                : Sat Mar 17 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cmodulechooserbar.h"
-#include "cmodulechooserbutton.h"
-
-#include <qtimer.h>
-
-CModuleChooserBar::CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type, QWidget *parent, const char *name )
-  : KToolBar(parent,name),
-  m_moduleType(type),
-  m_idCounter(0),
-	m_buttonLimit(-1) //-1 means no limit
-{
-  //insert buttons if useModules != 0
-	for (useModules.first(); useModules.current(); useModules.next())		 {
-		if ((m_buttonLimit != -1) && ( m_buttonLimit <= (int)m_buttonList.count()) ) { //we reached the button limit
-			break;
-    };
-    
-		addButton( useModules.current() );
-  }
-
-  // We can add a button to choose an additional module
-  if ( (m_buttonLimit == -1) || (m_buttonLimit > (int)m_buttonList.count()) ) { 
-	  addButton(0); //add a button without module set
-  }
-}
-
-/** Adds a button to the toolbar */
-CModuleChooserButton* const CModuleChooserBar::addButton( CSwordModuleInfo* const module ) {
-	CModuleChooserButton* b = new CModuleChooserButton(module, m_moduleType, ++m_idCounter, this);
-	m_buttonList.append(b);	
-	insertWidget( m_idCounter, b->size().width(),b );			
-	
- 	connect( b, SIGNAL(sigAddButton()), this, SLOT(addButton()) );
- 	connect( b, SIGNAL(sigRemoveButton(const int)), this, SLOT(removeButton(const int)) );
- 	connect( b, SIGNAL(sigChanged()), SIGNAL(sigChanged()) );
-	
-	b->show();
-
-  return b;
-}
-
-void CModuleChooserBar::addButton( ) {
-  addButton(0);
-}
-
-/** Removes a button from the toolbar */
-void CModuleChooserBar::removeButton( const int ID ){
-	for (m_buttonList.first(); m_buttonList.current(); m_buttonList.next()) {	
-		if (m_buttonList.current()->getId() == ID) {	//found the right button
-			CModuleChooserButton* b = m_buttonList.current();
-			m_buttonList.removeRef(b);
-			b->hide();
-      b->deleteLater();
-			break;
-		}
-	}		
-	
-	emit sigChanged();
-}
-
-/** Returns a list of selected modules. */
-ListCSwordModuleInfo CModuleChooserBar::getModuleList(){
-	qWarning("getModuleList called: %i buttons", m_buttonList.count());
-  ListCSwordModuleInfo list;
-//	list.setAutoDelete(false);
-//	list.clear();
-	
-	for (m_buttonList.first(); m_buttonList.current(); m_buttonList.next()) {	
-	  if ( CSwordModuleInfo* m = m_buttonList.current()->module() ) {
-  		list.append( m );
-      qWarning("append module %s", m->name().latin1());
-    }
-	}
-	return list;
-}
-
-/** Sets the number of the maximum count of buttons. */
-void CModuleChooserBar::setButtonLimit(const int limit){
-	m_buttonLimit = limit;
-  if (limit == -1) //no need to delete buttons
-    return;
-
-  const int tooMuch = m_buttonList.count() - limit;
-  for (int i = 0; i < tooMuch; ++i) {
-		CModuleChooserButton* b = m_buttonList.last();
-		m_buttonList.remove(b);
-		b->hide();
-		delete b;
-  }
-  
-//	for (m_buttonList.last(); m_buttonList.current() && ((int)m_buttonList.count() > m_buttonLimit); m_buttonList.prev() ) {
-//	}
-}
-
-/** Sets the modules which are chosen in this module chooser bar. */
-void CModuleChooserBar::setModules( ListCSwordModuleInfo useModules ){
-  qWarning("at first %i buttons", m_buttonList.count());
-	setButtonLimit(0);	
-	setButtonLimit(-1);		//these two lines clear the bar
-  qWarning("in the middle %i buttons", m_buttonList.count());
-
-  if (!useModules.count()) {
-    qWarning("no modules available");
-    return;
-  }
-
-  qWarning("chooserBar:setModule:  %i modules", useModules.count());
-	for (useModules.first(); useModules.current(); useModules.next())		 {
-		if ( (m_buttonLimit != -1) && (m_buttonLimit <= (int)m_buttonList.count()) ) {
-			break;
-    }
-
-    addButton( useModules.current() );
-  }
-  if ( (m_buttonLimit == -1) || (m_buttonLimit > (int)m_buttonList.count()) ) {
-	  addButton(0);//add button without module set
-  }
-  qWarning("at the end %i buttons", m_buttonList.count());
-}
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbar.h b/bibletime/frontend/displaywindow/cmodulechooserbar.h
deleted file mode 100644
index 180a651..0000000
--- a/bibletime/frontend/displaywindow/cmodulechooserbar.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/***************************************************************************
-                          cmodulechooserbar.h  -  description
-                             -------------------
-    begin                : Sat Mar 17 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CMODULECHOOSERBAR_H
-#define CMODULECHOOSERBAR_H
-
-//BibleTime includes
-#include "cmodulechooserbutton.h"
-
-#include "backend/cswordmoduleinfo.h"
-
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qhbox.h>
-
-//KDE includes
-#include <ktoolbar.h>
-
-/**
-  * @author The BibleTime team
-  */
-class CModuleChooserBar : public KToolBar  {
-   Q_OBJECT
-public: 
-	/**
-	* Default constructor
-	*/
-	CModuleChooserBar(ListCSwordModuleInfo useModules, CSwordModuleInfo::ModuleType type,  QWidget *parent=0, const char *name=0);
-  /**
-  * Returns a list of selected modules.
-  */
-  ListCSwordModuleInfo getModuleList();
-  /**
-  * Sets the number of the maximum count of buttons.
-  */
-  void setButtonLimit( const int limit);
-  /**
-  * Sets the modules which are chosen in this module chooser bar.
-  */
-  void setModules( ListCSwordModuleInfo modules );
-	
-protected:
-  /**
-  * Adds a button to the toolbar
-  */
-  CModuleChooserButton* const addButton( CSwordModuleInfo* const module );
-
-protected slots: // Protected slots
-  /* Add a button
-  * This slot calls the addButton function above to add a button.
-  */
-  void addButton();
-  /**
-	* Removes a button from the toolbar
-	*/
-	void removeButton( const int ID );
-
-private:
-	QPtrList<CModuleChooserButton> m_buttonList;
-	CSwordModuleInfo::ModuleType m_moduleType;
-	int m_idCounter;
-	int m_buttonLimit;
-
-signals: // Signals
-  void sigChanged();
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp b/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
deleted file mode 100644
index cf9f40e..0000000
--- a/bibletime/frontend/displaywindow/cmodulechooserbutton.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/***************************************************************************
-                          cmodulechooserbutton.cpp  -  description
-                             -------------------
-    begin                : Sat Mar 17 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cmodulechooserbutton.h"
-
-#include "backend/cswordbackend.h"
-
-#include "util/cresmgr.h"
-
-//Qt includes
-#include <qstring.h>
-#include <qtooltip.h>
-#include <qdict.h>
-#include <qvaluelist.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kglobal.h>
-#include <kiconloader.h>
-
-CModuleChooserButton::CModuleChooserButton(CSwordModuleInfo* useModule,CSwordModuleInfo::ModuleType type, const int id, QWidget *parent, const char *name )
-	: KToolBarButton(iconName(), id, parent,name), m_id(id), m_popup(0) {
-
-  m_moduleType = type;	
-	m_module = useModule;
-	if (!m_module) {
-  	m_hasModule = false;
-  }
-  else {
-    m_hasModule = true;
-  }
-	
-	setIcon( iconName() );
-	setPopupDelay(0);
-
-	populateMenu();
-}	
-
-/** Returns the icon used for the current status. */
-const QString CModuleChooserButton::iconName(){
-	switch (m_moduleType) {
-		case CSwordModuleInfo::Bible:
-			if (m_hasModule)
-				return CResMgr::modules::bible::icon_unlocked;
-			else
-				return CResMgr::modules::bible::icon_add;
-		case CSwordModuleInfo::Commentary:
-			if (m_hasModule)
-				return CResMgr::modules::commentary::icon_unlocked;
-			else
-				return CResMgr::modules::commentary::icon_add;
-		case CSwordModuleInfo::Lexicon:
-			if (m_hasModule)
-				return CResMgr::modules::lexicon::icon_unlocked;
-			else
-				return CResMgr::modules::lexicon::icon_add;
-		case CSwordModuleInfo::GenericBook:
-			if (m_hasModule)
-				return CResMgr::modules::book::icon_unlocked;
-			else
-				return CResMgr::modules::book::icon_add;
-		default: //return as default the bible icon
-			return CResMgr::modules::bible::icon_unlocked;
-	}
-}
-
-CSwordModuleInfo* CModuleChooserButton::module() {
-	for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
-  	for (unsigned int i = 0; i < popup->count(); i++) {
-  		if ( m_popup->isItemChecked(popup->idAt(i)) ){
-				QString mod = popup->text(popup->idAt(i));
-  			return backend()->findModuleByName( mod.left(mod.find(" ")) );
-			}
-  	}	
-
-	}
-	return 0; //"none" selected
-}
-
-/** Returns the id used for this button. */
-int CModuleChooserButton::getId() const{
-	return m_id;
-}
-
-/** Ís called after a module was selected in the popup */
-void CModuleChooserButton::moduleChosen( int ID ){	
-	for ( KPopupMenu* popup = m_submenus.first(); popup; popup = m_submenus.next() ) {
-   	for (unsigned int i = 0; i < popup->count(); i++){
-   		popup->setItemChecked(popup->idAt(i),false);	
-   	}	
-   	popup->setItemChecked(ID, true);
-	}
-
-	m_popup->setItemChecked(m_noneId, false); //uncheck the "none" item
-
- 	if (m_popup->text(ID) == i18n("NONE")) { // note: this is for m_popup, the toplevel!
- 		if (m_hasModule) {
- 			emit sigRemoveButton(m_id);
- 			return;
-		}
- 	}
- 	else {
- 	  if (!m_hasModule) {
- 	    emit sigAddButton();
-    }
-    
- 		m_hasModule = true;  	
- 		m_module = module();
-  	setIcon( iconName() );
-   	emit sigChanged();
-
-    setText( i18n("Select a module") );
-    m_popup->changeTitle(m_titleId, i18n("Select a module"));	
-     	
-   	QToolTip::remove(this);
-   	if (module()) {
-   		QToolTip::add(this, module()->name());
-    }
- 	}
-}
-/** No descriptions */
-void CModuleChooserButton::populateMenu(){
-	if (m_popup)
-		delete m_popup;
-	m_submenus.setAutoDelete(true);
-	m_submenus.clear();
-
-	//create popup
-	m_popup = new KPopupMenu(this);	
-
-	if (m_module)
-	  m_titleId = m_popup->insertTitle(i18n("Select a module"));	
-	else
-	  m_titleId = m_popup->insertTitle(i18n("Select an additional module"));	
-
-	m_popup->setCheckable(true);
-
-	m_noneId =	m_popup->insertItem(i18n("NONE"));
-  if ( !m_module )
-		m_popup->setItemChecked(m_noneId, true);
-
-	m_popup->insertSeparator();	
-	connect(m_popup, SIGNAL(activated(int)), this, SLOT(moduleChosen(int)));		
-	setPopup(m_popup, true);
-
-	QStringList languages;
-	QDict<KPopupMenu> langdict;
-
-  //the modules list contains only the modules we can use, i.e. same type and same features
-  ListCSwordModuleInfo modules;
-  ListCSwordModuleInfo allMods = backend()->moduleList();
-
-  for (allMods.first(); allMods.current(); allMods.next()) {
-    if (allMods.current()->type() != m_moduleType)
-      continue;
-    modules.append(allMods.current());
-  };
-
-	for (modules.first(); modules.current(); modules.next()) {
- 		QString lang = modules.current()->language().translatedName();
- 		if (lang.isEmpty())
- 			lang = QString::fromLatin1("xx"); //unknown language -- not use English as default!!
- 	 	if (languages.find( lang ) == languages.end() ){ //not yet added
- 			languages += lang;
- 			KPopupMenu* menu = new KPopupMenu;
- 			langdict.insert(lang, menu );
- 			m_submenus.append(menu);
- 			connect(menu, SIGNAL(activated(int)), this, SLOT(moduleChosen(int)));		
- 		}
-	}	
-
-	//Check the appropriate entry
-	for (modules.first(); modules.current(); modules.next()) {
- 		QString lang = modules.current()->language().translatedName();
- 		if (lang.isEmpty())
- 			lang = QString::fromLatin1("xx"); //unknown language
- 		QString name = QString(modules.current()->name()) + QString(" ")+
- 			(modules.current()->isLocked() ? i18n("[locked]") : QString::null); 			
- 		int id = langdict[lang]->insertItem( name );
- 		if ( m_module && modules.current()->name() == m_module->name()) {
- 			langdict[lang]->setItemChecked(id,true);
- 		}
-	}	
-
-	languages.sort();
-  for ( QStringList::Iterator it = languages.begin(); it != languages.end(); ++it ) {
-		m_popup->insertItem( *it, langdict[*it]);
-	}
-
- 	if (module())
- 		QToolTip::add(this, module()->name());
-	else
- 		QToolTip::add(this, i18n("No module selected"));
-
-}
diff --git a/bibletime/frontend/displaywindow/cmodulechooserbutton.h b/bibletime/frontend/displaywindow/cmodulechooserbutton.h
deleted file mode 100644
index 71ba563..0000000
--- a/bibletime/frontend/displaywindow/cmodulechooserbutton.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/***************************************************************************
-                          cmodulechooserbutton.h  -  description
-                             -------------------
-    begin                : Sat Mar 17 2001
-    copyright            : (C) 2001 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CMODULECHOOSERBUTTON_H
-#define CMODULECHOOSERBUTTON_H
-
-//BibleTime includes
-#include "backend/cswordmoduleinfo.h"
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qdict.h>
-#include <qtoolbutton.h>
-
-//KDE includes
-#include <ktoolbarbutton.h>
-#include <kpopupmenu.h>
-
-class KPopupMenu;
-
-/** The CModuleChooserButton displays a list of submenus sorted by language which contain the possible modules
-  * which can be displayed together with the first one.
-  * @author The BibleTime team
-  */
-class CModuleChooserButton : public KToolBarButton, public CPointers  {
-   Q_OBJECT
-public: 
-	CModuleChooserButton(CSwordModuleInfo* useModule, CSwordModuleInfo::ModuleType type, const int id, QWidget *parent = 0, const char *name = 0 );
-  CSwordModuleInfo* module();
-  /**
-  * Returns the id used for this button.
-  */
-  int getId() const;
-
-protected: // Protected methods
-  void populateMenu();
-	
-private:
-  /**
-  * Returns the icon used for the current status.
-  */
-  const QString iconName();
-	
-	bool m_hasModule;
-  int m_id;
-  int m_noneId;
-	int m_titleId;
-	CSwordModuleInfo::ModuleType m_moduleType;
-	CSwordModuleInfo* m_module;
-
-	KPopupMenu* m_popup;
-	QPtrList<KPopupMenu> m_submenus;
-
-private slots:
-	void moduleChosen(int ID );
-
-signals:
-	void sigRemoveButton(const int ID);
-	void sigAddButton();
-  void sigChanged();
-};
-#endif
diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.cpp b/bibletime/frontend/displaywindow/cplainwritewindow.cpp
deleted file mode 100644
index 7ec69f8..0000000
--- a/bibletime/frontend/displaywindow/cplainwritewindow.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/***************************************************************************
-                          cplainwritewindow.cpp  -  description
-                             -------------------
-    begin                : Fre Okt 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cplainwritewindow.h"
-
-#include "frontend/keychooser/ckeychooser.h"
-#include "frontend/cprofilewindow.h"
-#include "frontend/cbtconfig.h"
-
-#include "util/cresmgr.h"
-
-//Qt includes
-#include <qregexp.h>
-
-//KDE includes
-#include <kaction.h>
-#include <kaccel.h>
-#include <klocale.h>
-
-CPlainWriteWindow::CPlainWriteWindow(ListCSwordModuleInfo moduleList, CMDIArea* parent, const char *name ) : CWriteWindow(moduleList, parent, name) {
-	setKey( CSwordKey::createInstance(moduleList.first()) );
-}
-
-
-CPlainWriteWindow::~CPlainWriteWindow(){
-}
-
-/** Initialize the state of this widget. */
-void CPlainWriteWindow::initView(){
-//  qWarning("CPlainWriteWindow::initView()");
- 	setDisplayWidget( CDisplay::createWriteInstance(this) );
-//  Q_ASSERT(displayWidget());
- 	setCentralWidget( displayWidget()->view() );
-
-  setMainToolBar( new KToolBar(this) );
-  mainToolBar()->setFullSize(true);
-	addDockWindow(mainToolBar());
-
-	setKeyChooser( CKeyChooser::createInstance(modules(), key(), mainToolBar()) );
-	mainToolBar()->insertWidget(0,keyChooser()->sizeHint().width(),keyChooser());
- 	mainToolBar()->setFullSize(false);
-
-	m_actions.syncWindow = new KToggleAction(i18n("Sync with active bible"),
-		CResMgr::displaywindows::commentaryWindow::syncWindow::icon,
-		CResMgr::displaywindows::commentaryWindow::syncWindow::accel,
-		actionCollection(),
-		CResMgr::displaywindows::commentaryWindow::syncWindow::actionName
-	);
-	m_actions.syncWindow->setToolTip(CResMgr::displaywindows::commentaryWindow::syncWindow::tooltip); m_actions.syncWindow->setWhatsThis(CResMgr::displaywindows::commentaryWindow::syncWindow::whatsthis);
-  m_actions.syncWindow->plug(mainToolBar());
-
-
-	m_actions.saveText = new KAction(i18n("Save text"),
-    CResMgr::displaywindows::writeWindow::saveText::icon,
-    CResMgr::displaywindows::writeWindow::saveText::accel,
-    this, SLOT(saveCurrentText()),
-    actionCollection(),
-		CResMgr::displaywindows::writeWindow::saveText::actionName
-  );
-  m_actions.saveText->setToolTip( CResMgr::displaywindows::writeWindow::saveText::tooltip );
-  m_actions.saveText->setWhatsThis( CResMgr::displaywindows::writeWindow::saveText::whatsthis );
-  m_actions.saveText->plug(mainToolBar());
-
-
- 	m_actions.deleteEntry = new KAction(i18n("Delete current entry"),
-    CResMgr::displaywindows::writeWindow::deleteEntry::icon,
-    CResMgr::displaywindows::writeWindow::deleteEntry::accel,
-    this, SLOT(deleteEntry()),
-    actionCollection(),
-		CResMgr::displaywindows::writeWindow::deleteEntry::actionName
-  );
-  m_actions.deleteEntry->setToolTip( CResMgr::displaywindows::writeWindow::deleteEntry::tooltip );
-  m_actions.deleteEntry->setWhatsThis( CResMgr::displaywindows::writeWindow::deleteEntry::whatsthis );
-  m_actions.deleteEntry->plug(mainToolBar());
-
-
- 	m_actions.restoreText = new KAction(i18n("Restore original text"),
-    CResMgr::displaywindows::writeWindow::restoreText::icon,
-    CResMgr::displaywindows::writeWindow::restoreText::accel,
-    this, SLOT(restoreText()),
-    actionCollection(),
-		CResMgr::displaywindows::writeWindow::restoreText::actionName
-  );
-  m_actions.restoreText->setToolTip( CResMgr::displaywindows::writeWindow::restoreText::tooltip );
-  m_actions.restoreText->setWhatsThis( CResMgr::displaywindows::writeWindow::restoreText::whatsthis );
-  m_actions.restoreText->plug(mainToolBar());
-}
-
-void CPlainWriteWindow::initConnections(){
-	CWriteWindow::initConnections();
-	connect(keyChooser(), SIGNAL(keyChanged(CSwordKey*)),
-		this, SLOT(lookup(CSwordKey*)));
-
-  connect(displayWidget()->connectionsProxy(), SIGNAL(textChanged()),
-    this, SLOT(textChanged()) );
-}
-
-void CPlainWriteWindow::storeProfileSettings( CProfileWindow* profileWindow ) {
-  CWriteWindow::storeProfileSettings(profileWindow);
-  profileWindow->setWindowSettings( m_actions.syncWindow->isChecked() );
-};
-
-void CPlainWriteWindow::applyProfileSettings( CProfileWindow* profileWindow ) {
-  CWriteWindow::applyProfileSettings(profileWindow);
-  if (profileWindow->windowSettings()) {
-    m_actions.syncWindow->setChecked(true);
-	}
-};
-
-/** Saves the text for the current key. Directly writes the changed text into the module. */
-void CPlainWriteWindow::saveCurrentText( const QString& key ) {
-  QString t = displayWidget()->plainText();
-  //since t is a complete HTML page at the moment, strip away headers and footers of a HTML page
-  QRegExp re("(?:<html.*>.+<body.*>)", false); //remove headers, case insensitive
-  re.setMinimal(true);
-  t.replace(re, "");
-  t.replace(QRegExp("</body></html>", false), "");//remove footer
-
-	const QString& oldKey = this->key()->key();
-  modules().first()->write(this->key(), t );
-	this->key()->key( oldKey );
-
-  displayWidget()->setModified(false);
-  textChanged();
-}
-
-/** Loads the original text from the module. */
-void CPlainWriteWindow::restoreText(){
-  lookup(key());
-  displayWidget()->setModified(false);
-  textChanged();
-}
-
-/** Is called when the current text was changed. */
-void CPlainWriteWindow::textChanged() {
-	m_actions.saveText->setEnabled( displayWidget()->isModified() );
-  m_actions.restoreText->setEnabled( displayWidget()->isModified() );
-}
-
-/** Deletes the module entry and clears the edit widget, */
-void CPlainWriteWindow::deleteEntry(){
-  modules().first()->deleteEntry( key() );
-  lookup( key() );
-  displayWidget()->setModified(false);
-}
-
-/** Setups the popup menu of this display widget. */
-void CPlainWriteWindow::setupPopupMenu(){
-}
-
-const bool CPlainWriteWindow::syncAllowed() const {
-	return m_actions.syncWindow->isChecked();
-}
-
-void CPlainWriteWindow::initKeyboardActions() {
-  CWriteWindow::initKeyboardActions();
-
-	CBTConfig::setupAccel( CBTConfig::writeWindow, accel() );
-  insertKeyboardActions( accel() );
-
-  accel()->readSettings();
-	//accel()->setSlot("Copy", displayWidget()->connectionsProxy(), SLOT(copySelection()));
-
-/*
-	accel()->setSlot("Next book", this, SLOT(nextBook()));
-  accel()->setSlot("Previous book", this, SLOT(previousBook()));
-  accel()->setSlot("Next chapter", this, SLOT(nextChapter()));
-  accel()->setSlot("Previous chapter", this, SLOT(previousChapter()));
-  accel()->setSlot("Next verse", this, SLOT(nextVerse()));
-  accel()->setSlot("Previous verse", this, SLOT(previousVerse()));
-*/
-}
-
-void CPlainWriteWindow::insertKeyboardActions( KAccel* const a ) {
-  a->insert("Next book",        i18n("Next book"),        "", CResMgr::displaywindows::bibleWindow::nextBook::accel,        0, "");
-	a->insert("Previous book",    i18n("Previous book"),    "", CResMgr::displaywindows::bibleWindow::previousBook::accel,    0, "");
-	a->insert("Next chapter",     i18n("Next chapter"),     "", CResMgr::displaywindows::bibleWindow::nextChapter::accel,     0, "");
-	a->insert("Previous chapter", i18n("Previous chapter"), "", CResMgr::displaywindows::bibleWindow::previousChapter::accel, 0, "");
-	a->insert("Next verse",       i18n("Next verse"),       "", CResMgr::displaywindows::bibleWindow::nextVerse::accel,       0, "");
-	a->insert("Previous verse",   i18n("Previous verse"),   "", CResMgr::displaywindows::bibleWindow::previousVerse::accel,   0, "");
-
-	a->insert("Save text",   i18n("Save text"),   "", CResMgr::displaywindows::writeWindow::saveText::accel,   0, "");
-}
-
-//void CPlainWriteWindow::setupPopupMenu() {
-//	qWarning("Plain wite window: setup popup menu");
-//}
diff --git a/bibletime/frontend/displaywindow/cplainwritewindow.h b/bibletime/frontend/displaywindow/cplainwritewindow.h
deleted file mode 100644
index c6d2f84..0000000
--- a/bibletime/frontend/displaywindow/cplainwritewindow.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************
-                          cplainwritewindow.h  -  description
-                             -------------------
-    begin                : Fre Okt 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPLAINWRITEWINDOW_H
-#define CPLAINWRITEWINDOW_H
-
-//BibleTime includes
-#include "cwritewindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-
-class KAction;
-class KToggleAction;
-
-/** The write window class which offers a plain editor for source code editing.
-  * @author The BibleTime team
-  */
-class CPlainWriteWindow : public CWriteWindow  {
-   Q_OBJECT
-public:
-	CPlainWriteWindow( ListCSwordModuleInfo modules, CMDIArea* parent, const char *name = 0 );
-	~CPlainWriteWindow();
-
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings( CProfileWindow* profileWindow );
-  /**
-  * Store the settings of this window in the given profile window.
-  */
-  virtual void applyProfileSettings( CProfileWindow* profileWindow );
-
-	/**
-  * Setups the popup menu of this display widget.
-  */
-  virtual void setupPopupMenu();
-	virtual const bool syncAllowed() const;
-
-protected: // Protected methods
-  /**
-  * Initialize the state of this widget.
-  */
-  virtual void initView();
-  virtual void initConnections();
-  virtual const CDisplayWindow::WriteWindowType writeWindowType() {
-    return CDisplayWindow::PlainTextWindow;
-  };
-
-	/**
-  * Initializes the intern keyboard actions.
-  */
-  virtual void initKeyboardActions();
-  /**
-  * Insert the keyboard accelerators of this window into the given KAccel object.
-  */
-  static void insertKeyboardActions( KAccel* const accel );
-//  virtual void setupPopupMenu();
-
-private:
-  struct {
-    KAction* saveText;
-    KAction* deleteEntry;
-    KAction* restoreText;
-		KToggleAction* syncWindow;
-  } m_actions;
-
-protected slots: // Protected slots
-  /**
-  * Saves the text for the current key. Directly writes the changed text into the module.
-  */
-  virtual void saveCurrentText( const QString& );
-  /**
-  * Is called when the current text was changed.
-  */
-  virtual void textChanged();
-  /**
-  * Loads the original text from the module.
-  */
-  virtual void restoreText();
-  /**
-  * Deletes the module entry and clears the edit widget.
-  */
-  virtual void deleteEntry();
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/creadwindow.cpp b/bibletime/frontend/displaywindow/creadwindow.cpp
deleted file mode 100644
index 4535aab..0000000
--- a/bibletime/frontend/displaywindow/creadwindow.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/***************************************************************************
-                          creadwindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "creadwindow.h"
-
-#include "backend/centrydisplay.h"
-#include "backend/cswordkey.h"
-
-#include "frontend/cbtconfig.h"
-#include "frontend/cexportmanager.h"
-#include "frontend/cmdiarea.h"
-#include "frontend/cprofilewindow.h"
-//#include "frontend/display/creaddisplay.h"
-#include "frontend/displaywindow/cmodulechooserbar.h"
-#include "frontend/keychooser/ckeychooser.h"
-
-
-//KDE includes
-#include <kpopupmenu.h>
-#include <kaccel.h>
-#include <kstdaccel.h>
-#include <klocale.h>
-
-CReadWindow::CReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name )
-  : CDisplayWindow(modules,parent,name),
-    m_displayWidget(0)
-{
-  
-}
-
-CReadWindow::~CReadWindow(){
-//	qWarning("destructor of CReadWindow");
-}
-
-/** Returns the display widget of this window. */
-CReadDisplay* const CReadWindow::displayWidget(){
-	return m_displayWidget;
-}
-
-/** Sets the display widget of this display window. */
-void CReadWindow::setDisplayWidget( CReadDisplay* newDisplay ){
-  CDisplayWindow::setDisplayWidget(newDisplay);
- 	if (m_displayWidget) {
-  	disconnect(m_displayWidget->connectionsProxy(), SIGNAL(referenceClicked(const QString&, const QString&)), this, SLOT(lookup(const QString&, const QString&)));
-  	disconnect(m_displayWidget->connectionsProxy(), SIGNAL(referenceDropped(const QString&)), this, SLOT(lookup(const QString&)));
-  }
-
-	m_displayWidget = newDisplay;
-  connect(m_displayWidget->connectionsProxy(), SIGNAL(referenceClicked(const QString&, const QString&)),this, SLOT(lookup(const QString&, const QString&)));
-  connect(m_displayWidget->connectionsProxy(), SIGNAL(referenceDropped(const QString&)), this, SLOT(lookup(const QString&)));
-}
-
-/** Lookup the given entry. */
-void CReadWindow::lookup( CSwordKey* newKey ){
-	if (!newKey || !modules().first())
-		return;
-
-	if (CEntryDisplay* display = modules().first()->getDisplay()) {	//do we have a display object?
- 		displayWidget()->setText( display->text( modules(), newKey->key(), displayOptions(), filterOptions() ) );
-	}
-	if (key() != newKey) {
-		key()->key(newKey->key());
-	}
-
-  displayWidget()->moveToAnchor( key()->key() );
-	setCaption( windowCaption() );
-}
-
-/** Reimplementation to use the popup menu. */
-const bool CReadWindow::init( const QString& keyName ){
-  CDisplayWindow::init(keyName);
-  keyChooser()->setKey(key());
-	setReady(true);
-
-  return true;
-}
-
-/** Store the settings of this window in the given CProfileWindow object. */
-void CReadWindow::storeProfileSettings(CProfileWindow * const settings){
-	QRect rect;
-	rect.setX(parentWidget()->x());
-	rect.setY(parentWidget()->y());
-	rect.setWidth(width());
-	rect.setHeight(height());
-	settings->setGeometry(rect);
-		
-//	settings->setScrollbarPositions( m_htmlWidget->view()->horizontalScrollBar()->value(), m_htmlWidget->view()->verticalScrollBar()->value() );
-	settings->setType(modules().first()->type());
-	settings->setMaximized(isMaximized() || parentWidget()->isMaximized());
-	settings->setFocus( (this == mdi()->activeWindow()) ); //set property to true if this window is the active one.
-	
-	if (key()) {
-		sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key());
-		QString oldLang;
-		if (vk) {
-		  oldLang = QString::fromLatin1(vk->getLocale());	
-			vk->setLocale("en"); //save english locale names as default!		
-		}
-		settings->setKey( key()->key() );
-		if (vk) {
-			vk->setLocale(oldLang.latin1());
-		}
-	}
-		
-	QStringList mods;
-  ListCSwordModuleInfo allMods = modules();
-	for (CSwordModuleInfo* m = allMods.first(); m; m = allMods.next()) {
-		mods.append(m->name());
-	}	
-	settings->setModules(mods);
-}
-
-void CReadWindow::applyProfileSettings(CProfileWindow * const settings){
-//  parentWidget()->setUpdatesEnabled(false);
-  setUpdatesEnabled(false);
-	
-	if (settings->maximized()) { //maximize this window
-   // Use parentWidget() to call showMaximized. Otherwise we'd get lot's of X11 errors
-   parentWidget()->showMaximized();
-	}
-	else {
-		const QRect rect = settings->geometry();
-		resize(rect.width(), rect.height());
-		parentWidget()->move(rect.x(), rect.y());
-	}
-	
-	setUpdatesEnabled(true);	
-//  parentWidget()->setUpdatesEnabled(true);
-}
-
-void CReadWindow::insertKeyboardActions( KAccel* const a ){
-  a->remove("Copy");
-  a->insert("Copy", i18n("Copy selected text"),"", KStdAccel::copy(), 0, "");
-}
-
-void CReadWindow::initKeyboardActions() {
-  CBTConfig::setupAccel( CBTConfig::readWindow, accel() );
-  insertKeyboardActions( accel() );
-
-  accel()->readSettings();
-	accel()->setSlot("Copy", displayWidget()->connectionsProxy(), SLOT(copySelection()));
-}
-
-/** No descriptions */
-void CReadWindow::copyDisplayedText(){
-  CExportManager mgr(QString::null);
-  mgr.copyKey(key(),CExportManager::Text,true);
-}
diff --git a/bibletime/frontend/displaywindow/creadwindow.h b/bibletime/frontend/displaywindow/creadwindow.h
deleted file mode 100644
index e6950e3..0000000
--- a/bibletime/frontend/displaywindow/creadwindow.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/***************************************************************************
-                          creadwindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CREADWINDOW_H
-#define CREADWINDOW_H
-
-//BibleTime includes
-#include "cdisplaywindow.h"
-
-#include "frontend/display/cdisplay.h"
-#include "frontend/display/creaddisplay.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qpopupmenu.h>
-
-class KPopupMenu;
-
-/** The base class for all read-only display windows.
-  * @author The BibleTime team
-  */
-
-class CReadWindow : public CDisplayWindow  {
-   Q_OBJECT
-public: 
-	static void insertKeyboardActions( KAccel* const a );
- 	
-  CReadWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-	virtual ~CReadWindow();
-  /**
-  * Reimplementation to use the popup menu.
-  */
-  virtual const bool init( const QString& key );
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings(CProfileWindow * const settings);
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void applyProfileSettings(CProfileWindow * const settings);
-
-protected: // Protected methods
-  /**
-  * Sets the display widget of this display window.
-  */
-  virtual void setDisplayWidget( CReadDisplay* newDisplay );
-  /**
-  * Returns the display widget of this window.
-  */
-  virtual CReadDisplay* const displayWidget();
-  /**
-  * Setup the entries of the popup menu.
-  */
-	virtual void initKeyboardActions();
-
-protected slots:
-  virtual void lookup( CSwordKey* );
-  /**
-  * Update the status of the popup menu entries.
-  */
-  virtual void copyDisplayedText();
-  
-private:
-	CReadDisplay* m_displayWidget;
-};
-
-#endif
diff --git a/bibletime/frontend/displaywindow/cwritewindow.cpp b/bibletime/frontend/displaywindow/cwritewindow.cpp
deleted file mode 100644
index a354955..0000000
--- a/bibletime/frontend/displaywindow/cwritewindow.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/***************************************************************************
-                          cwritewindow.cpp  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cwritewindow.h"
-
-#include "backend/cswordmoduleinfo.h"
-
-#include "frontend/keychooser/ckeychooser.h"
-#include "frontend/cprofilewindow.h"
-
-//KDE includes
-#include <kmessagebox.h>
-#include <klocale.h>
-
-CWriteWindow::CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name )
-  : CDisplayWindow(modules, parent,name), m_writeDisplay(0) {
-}
-
-CWriteWindow::~CWriteWindow(){
-}
-
-
-void CWriteWindow::insertKeyboardActions( KAccel* const /*a*/ ) {
-
-};
-
-const bool CWriteWindow::init( const QString& keyName ) {
-  qWarning("CWriteWindow::init( const QString& keyName )");
-  CDisplayWindow::init(keyName);
-// 	setupPopupMenu();
-  keyChooser()->setKey(key());
-	setReady(true);
-  return true;
-};
-
-
-void CWriteWindow::initConnections() {
-	qWarning("CWriteWindow::initConnections()");
-	Q_ASSERT(keyChooser());
-
-	connect(keyChooser(), SIGNAL(beforeKeyChange(const QString&)),
-		this, SLOT(beforeKeyChange(const QString&))
-	);
-};
-
-void CWriteWindow::initKeyboardActions() {
-};
-
-void CWriteWindow::storeProfileSettings(CProfileWindow * const settings) {
-
-  settings->setWriteWindowType( writeWindowType() );
-  
-	QRect rect;
-	rect.setX(parentWidget()->x());
-	rect.setY(parentWidget()->y());
-	rect.setWidth(width());
-	rect.setHeight(height());
-	settings->setGeometry(rect);
-
-//	settings->setScrollbarPositions( m_htmlWidget->view()->horizontalScrollBar()->value(), m_htmlWidget->view()->verticalScrollBar()->value() );
-	settings->setType(modules().first()->type());
-	settings->setMaximized(isMaximized() || parentWidget()->isMaximized());
-
-	if (key()) {
-		sword::VerseKey* vk = dynamic_cast<sword::VerseKey*>(key());
-		QString oldLang;
-		if (vk) {
-			 oldLang = QString::fromLatin1(vk->getLocale());
-			vk->setLocale("en"); //save english locale names as default!
-		}
-		settings->setKey( key()->key() );
-		if (vk) {
-			vk->setLocale(oldLang.latin1());
-		}
-	}
-
-	QStringList mods;
-	for (CSwordModuleInfo* m = modules().first(); m; m = modules().next()) {
-		mods.append(m->name());
-	}
-	settings->setModules(mods);
-};
-
-void CWriteWindow::applyProfileSettings(CProfileWindow * const settings) {
-	setUpdatesEnabled(false);
-
-	if (settings->maximized()) {
-		parentWidget()->showMaximized();
-	}
-	else {
-		const QRect rect = settings->geometry();
-		resize(rect.width(), rect.height());
-		parentWidget()->move(rect.x(), rect.y());
-		//setGeometry( settings->geometry() );
-	}
-//	displayWidget()->view()->horizontalScrollBar()->setValue( settings->scrollbarPositions().horizontal );
-//	m_htmlWidget->view()->verticalScrollBar()->setValue( settings->scrollbarPositions().vertical );
-
-	setUpdatesEnabled(true);
-};
-
-/** Sets the write display-widget for this write display window. */
-void CWriteWindow::setDisplayWidget( CWriteDisplay* display ){
-  CDisplayWindow::setDisplayWidget(display);
-  m_writeDisplay = display;
-}
-
-/** Look up the given key and display the text. In our case we offer to edit the text. */
-void CWriteWindow::lookup( CSwordKey* newKey ){
-  //set the raw text to the display widget
-	if (!newKey)
-		return;
-
-	if (key() != newKey) { //set passage of newKey to key() if they're different, otherwise we'd get mixed up if we look up newkey which may have a different module set
-		key()->key(newKey->key());
-  }
-
-	if ( modules().first() ) {
-  	displayWidget()->setText( key()->rawText() );
-  }
-	setCaption( windowCaption() );
-}
-
-/** Returns the write display widget used by this window. */
-CWriteDisplay* const CWriteWindow::displayWidget(){
-  return m_writeDisplay;
-}
-
-/** Saves settings */
-bool CWriteWindow::queryClose(){
-//  qWarning("queryClose called!");
-	//save the text if it has changed
-	if (m_writeDisplay->isModified()) {
-		switch (KMessageBox::warningYesNoCancel( this, i18n("Save text before closing?")) ) {
-			case KMessageBox::Yes: { //save and close
-	   		saveCurrentText();
-	   		m_writeDisplay->setModified( false );
-	     	return true;
-			}
-	   	case KMessageBox::No: //don't save and close
-	     	return true;
-	   	default: // cancel, don't close
-	     	return false;
-		}
-	}
-	return true;
-}
-
-void CWriteWindow::beforeKeyChange(const QString& key) {
-	Q_ASSERT(displayWidget());
-	Q_ASSERT(keyChooser());
-	if (!isReady()) {
-		return;
-	}
-
-	//If the text changed and we'd do a lookup ask the user if the text should be saved
-	if (modules().first() && displayWidget()->isModified()) {
-		switch (KMessageBox::warningYesNo( this, i18n("Save changed text?")) ) {
-			case KMessageBox::Yes: { //save the changes
-	   		saveCurrentText( key );
-	     	break;
-			}
-	    default: {// set modified to false so it won't ask again
-				displayWidget()->setModified(false);
-	     	break;
-			}
-		}
-	}
-}
diff --git a/bibletime/frontend/displaywindow/cwritewindow.h b/bibletime/frontend/displaywindow/cwritewindow.h
deleted file mode 100644
index d183d0f..0000000
--- a/bibletime/frontend/displaywindow/cwritewindow.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/***************************************************************************
-                          cwritewindow.h  -  description
-                             -------------------
-    begin                : Don Mai 9 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CWRITEWINDOW_H
-#define CWRITEWINDOW_H
-
-//BibleTime includes
-#include "frontend/display/cwritedisplay.h"
-#include "cdisplaywindow.h"
-
-//Qt includes
-#include <qwidget.h>
-
-/**The base class for all write-only display windows.
-  *@author The BibleTime team
-  */
-
-class CWriteWindow : public CDisplayWindow  {
-	Q_OBJECT
-public:
-	static void insertKeyboardActions( KAccel* const a );
-
-	CWriteWindow(ListCSwordModuleInfo modules, CMDIArea* parent, const char *name=0);
-	~CWriteWindow();
-  /**
-  * Reimplementation to use the popup menu.
-  */
-  virtual const bool init( const QString& key );
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void storeProfileSettings(CProfileWindow * const settings);
-  /**
-  * Store the settings of this window in the given CProfileWindow object.
-  */
-  virtual void applyProfileSettings(CProfileWindow * const settings);
-  /**
-  * Returns the write display widget used by this window.
-  */
-  CWriteDisplay* const displayWidget();
-  virtual void initConnections();
-  virtual void initKeyboardActions();
-
-public slots:
-  /**
-  * Look up the given key and display the text. In our case we offer to edit the text.
-  */
-  virtual void lookup( CSwordKey* key );
-
-
-protected: // Protected methods
-  /**
-  * Saves the given text as text of the given key. Use this function
-	* as backend in each write window implementation.
-  */
-  void setDisplayWidget( CWriteDisplay* display );
-  virtual const CDisplayWindow::WriteWindowType writeWindowType() = 0;
-  virtual bool queryClose();
-  virtual void saveCurrentText( const QString& key ) = 0;
-
-protected slots:
-  /** Save text to the module
-  */
-  void saveCurrentText() {
-		if(key()) {
-			saveCurrentText(key()->key());
-		};
-	};
-	virtual void beforeKeyChange(const QString&);
-
-private:
-  CWriteDisplay* m_writeDisplay;
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/Makefile.am b/bibletime/frontend/keychooser/Makefile.am
deleted file mode 100644
index 4fa0d18..0000000
--- a/bibletime/frontend/keychooser/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-INCLUDES = $(all_includes)
-
-libkeychooser_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libkeychooser.a
-
-libkeychooser_a_SOURCES = \
-cbiblekeychooser.cpp \
-clexiconkeychooser.cpp \
-ckeychooser.cpp \
-cfx_btn.cpp \
-ckeychooserwidget.cpp \
-cbookkeychooser.cpp \
-cbooktreechooser.cpp
-
-all_headers = ckeychooserwidget.h \
-cfx_btn.h \
-ckeychooser.h \
-clexiconkeychooser.h \
-cbiblekeychooser.h \
-cbookkeychooser.h \
-cbooktreechooser.h
-
-EXTRA_DIST = $(libkeychooser_a_SOURCES) $(all_headers)
-
diff --git a/bibletime/frontend/keychooser/Makefile.in b/bibletime/frontend/keychooser/Makefile.in
deleted file mode 100644
index 201c969..0000000
--- a/bibletime/frontend/keychooser/Makefile.in
+++ /dev/null
@@ -1,768 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-
-#>- libkeychooser_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libkeychooser.a
-
-libkeychooser_a_SOURCES = \
-cbiblekeychooser.cpp \
-clexiconkeychooser.cpp \
-ckeychooser.cpp \
-cfx_btn.cpp \
-ckeychooserwidget.cpp \
-cbookkeychooser.cpp \
-cbooktreechooser.cpp
-
-
-all_headers = ckeychooserwidget.h \
-cfx_btn.h \
-ckeychooser.h \
-clexiconkeychooser.h \
-cbiblekeychooser.h \
-cbookkeychooser.h \
-cbooktreechooser.h
-
-
-EXTRA_DIST = $(libkeychooser_a_SOURCES) $(all_headers)
-subdir = bibletime/frontend/keychooser
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libkeychooser_a_AR = $(AR) cru
-libkeychooser_a_LIBADD =
-am_libkeychooser_a_OBJECTS = cbiblekeychooser.$(OBJEXT) \
-	clexiconkeychooser.$(OBJEXT) ckeychooser.$(OBJEXT) \
-	cfx_btn.$(OBJEXT) ckeychooserwidget.$(OBJEXT) \
-	cbookkeychooser.$(OBJEXT) cbooktreechooser.$(OBJEXT)
-#>- libkeychooser_a_OBJECTS = $(am_libkeychooser_a_OBJECTS)
-#>+ 8
-libkeychooser_a_final_OBJECTS = libkeychooser_a.all_cpp.o 
-libkeychooser_a_nofinal_OBJECTS = cbiblekeychooser.$(OBJEXT) \
-	clexiconkeychooser.$(OBJEXT) ckeychooser.$(OBJEXT) \
-	cfx_btn.$(OBJEXT) ckeychooserwidget.$(OBJEXT) \
-	cbookkeychooser.$(OBJEXT) cbooktreechooser.$(OBJEXT)\
-crefselectdialog.moc.o cbookkeychooser.moc.o ckeychooserwidget.moc.o cfx_btn.moc.o cbooktreechooser.moc.o ckeychooser.moc.o clexiconkeychooser.moc.o cbiblekeychooser.moc.o 
-@KDE_USE_FINAL_FALSE@libkeychooser_a_OBJECTS = $(libkeychooser_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libkeychooser_a_OBJECTS = $(libkeychooser_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cbiblekeychooser.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cbookkeychooser.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cbooktreechooser.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cfx_btn.Po ./$(DEPDIR)/ckeychooser.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/ckeychooserwidget.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/clexiconkeychooser.Po
-#>+ 12
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/crefselectdialog.moc.P $(DEPDIR)/cbookkeychooser.moc.P $(DEPDIR)/ckeychooserwidget.moc.P $(DEPDIR)/cfx_btn.moc.P $(DEPDIR)/cbooktreechooser.moc.P $(DEPDIR)/ckeychooser.moc.P $(DEPDIR)/clexiconkeychooser.moc.P $(DEPDIR)/cbiblekeychooser.moc.P  $(DEPDIR)/libkeychooser_a.all_cpp.P ./$(DEPDIR)/cbiblekeychooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cbookkeychooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cbooktreechooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cfx_btn.Po ./$(DEPDIR)/ckeychooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ckeychooserwidget.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/clexiconkeychooser.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/crefselectdialog.moc.P $(DEPDIR)/cbookkeychooser.moc.P $(DEPDIR)/ckeychooserwidget.moc.P $(DEPDIR)/cfx_btn.moc.P $(DEPDIR)/cbooktreechooser.moc.P $(DEPDIR)/ckeychooser.moc.P $(DEPDIR)/clexiconkeychooser.moc.P $(DEPDIR)/cbiblekeychooser.moc.P ./$(DEPDIR)/cbiblekeychooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cbookkeychooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cbooktreechooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cfx_btn.Po ./$(DEPDIR)/ckeychooser.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ckeychooserwidget.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/clexiconkeychooser.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libkeychooser_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libkeychooser_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/frontend/keychooser/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/keychooser/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/keychooser/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libkeychooser.a: $(libkeychooser_a_OBJECTS) $(libkeychooser_a_DEPENDENCIES) 
-	-rm -f libkeychooser.a
-	$(libkeychooser_a_AR) libkeychooser.a $(libkeychooser_a_OBJECTS) $(libkeychooser_a_LIBADD)
-	$(RANLIB) libkeychooser.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbiblekeychooser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbookkeychooser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cbooktreechooser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfx_btn.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ckeychooser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ckeychooserwidget.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clexiconkeychooser.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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:  $(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 "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-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
-
-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-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-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.
-.NOEXPORT:
-
-#>+ 3
-crefselectdialog.moc.cpp: $(srcdir)/crefselectdialog.h
-	$(MOC) $(srcdir)/crefselectdialog.h -o crefselectdialog.moc.cpp
-
-#>+ 2
-mocs: crefselectdialog.moc.cpp
-
-#>+ 3
-cbookkeychooser.moc.cpp: $(srcdir)/cbookkeychooser.h
-	$(MOC) $(srcdir)/cbookkeychooser.h -o cbookkeychooser.moc.cpp
-
-#>+ 2
-mocs: cbookkeychooser.moc.cpp
-
-#>+ 3
-ckeychooserwidget.moc.cpp: $(srcdir)/ckeychooserwidget.h
-	$(MOC) $(srcdir)/ckeychooserwidget.h -o ckeychooserwidget.moc.cpp
-
-#>+ 2
-mocs: ckeychooserwidget.moc.cpp
-
-#>+ 3
-cfx_btn.moc.cpp: $(srcdir)/cfx_btn.h
-	$(MOC) $(srcdir)/cfx_btn.h -o cfx_btn.moc.cpp
-
-#>+ 2
-mocs: cfx_btn.moc.cpp
-
-#>+ 3
-cbooktreechooser.moc.cpp: $(srcdir)/cbooktreechooser.h
-	$(MOC) $(srcdir)/cbooktreechooser.h -o cbooktreechooser.moc.cpp
-
-#>+ 2
-mocs: cbooktreechooser.moc.cpp
-
-#>+ 3
-ckeychooser.moc.cpp: $(srcdir)/ckeychooser.h
-	$(MOC) $(srcdir)/ckeychooser.h -o ckeychooser.moc.cpp
-
-#>+ 2
-mocs: ckeychooser.moc.cpp
-
-#>+ 3
-clexiconkeychooser.moc.cpp: $(srcdir)/clexiconkeychooser.h
-	$(MOC) $(srcdir)/clexiconkeychooser.h -o clexiconkeychooser.moc.cpp
-
-#>+ 2
-mocs: clexiconkeychooser.moc.cpp
-
-#>+ 3
-cbiblekeychooser.moc.cpp: $(srcdir)/cbiblekeychooser.h
-	$(MOC) $(srcdir)/cbiblekeychooser.h -o cbiblekeychooser.moc.cpp
-
-#>+ 2
-mocs: cbiblekeychooser.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  crefselectdialog.moc.cpp cbookkeychooser.moc.cpp ckeychooserwidget.moc.cpp cfx_btn.moc.cpp cbooktreechooser.moc.cpp ckeychooser.moc.cpp clexiconkeychooser.moc.cpp cbiblekeychooser.moc.cpp
-
-#>+ 2
-KDE_DIST=cfx_btn.h crefselectdialog.h ckeychooser.h crefselectdialog.cpp cbiblekeychooser.h clexiconkeychooser.h ckeychooserwidget.h cbooktreechooser.h cbookkeychooser.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/keychooser/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/keychooser/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libkeychooser_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cbiblekeychooser.cpp $(srcdir)/clexiconkeychooser.cpp $(srcdir)/ckeychooser.cpp $(srcdir)/cfx_btn.cpp $(srcdir)/ckeychooserwidget.cpp $(srcdir)/cbookkeychooser.cpp $(srcdir)/cbooktreechooser.cpp cbookkeychooser.moc.cpp crefselectdialog.moc.cpp ckeychooserwidget.moc.cpp cfx_btn.moc.cpp cbooktreechooser.moc.cpp ckeychooser.moc.cpp cbiblekeychooser.moc.cpp clexiconkeychooser.moc.cpp 
-	@echo 'creating libkeychooser_a.all_cpp.cpp ...'; \
-	rm -f libkeychooser_a.all_cpp.files libkeychooser_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libkeychooser_a.all_cpp.final; \
-	for file in cbiblekeychooser.cpp clexiconkeychooser.cpp ckeychooser.cpp cfx_btn.cpp ckeychooserwidget.cpp cbookkeychooser.cpp cbooktreechooser.cpp cbookkeychooser.moc.cpp crefselectdialog.moc.cpp ckeychooserwidget.moc.cpp cfx_btn.moc.cpp cbooktreechooser.moc.cpp ckeychooser.moc.cpp cbiblekeychooser.moc.cpp clexiconkeychooser.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libkeychooser_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libkeychooser_a.all_cpp.final; \
-	done; \
-	cat libkeychooser_a.all_cpp.final libkeychooser_a.all_cpp.files > libkeychooser_a.all_cpp.cpp; \
-	rm -f libkeychooser_a.all_cpp.final libkeychooser_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libkeychooser_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libkeychooser_a_OBJECTS="$(libkeychooser_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.cpp b/bibletime/frontend/keychooser/cbiblekeychooser.cpp
deleted file mode 100644
index 563e187..0000000
--- a/bibletime/frontend/keychooser/cbiblekeychooser.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-/***************************************************************************
-                          cbiblekeychooser.cpp  -  description
-                             -------------------
-    begin                : Wed Sep 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cbiblekeychooser.h"
-#include "ckeychooserwidget.h"
-#include "cfx_btn.h"
-
-#include "backend/cswordversekey.h"
-#include "backend/cswordbiblemoduleinfo.h"
-#include "backend/cswordmoduleinfo.h"
-
-#include "util/cresmgr.h"
-
-//Qt includes
-#include <qcombobox.h>
-#include <qlistbox.h>
-#include <qlayout.h>
-#include <qpushbutton.h>
-
-//KDE includes
-#include <klocale.h>
-
-CBibleKeyChooser::CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name )
-	: CKeyChooser(modules, key, parent, name), m_key(dynamic_cast<CSwordVerseKey*>(key))
-{
-	setModules(modules, false);
-	if (!m_modules.count()) {
-		qWarning("CBibleKeyChooser: module is not a Bible or commentary!");
-    m_key = 0;
-		return;
-	}
-
-	QHBoxLayout* layout = new QHBoxLayout(this);
-  layout->setDirection( QBoxLayout::LeftToRight );
-		
-	w_book = new CKeyChooserWidget(m_modules.first()->books(),false,this);	
-	w_book->setToolTips(
-    CResMgr::displaywindows::bibleWindow::bookList::tooltip,
-    CResMgr::displaywindows::bibleWindow::nextBook::tooltip,
-    CResMgr::displaywindows::general::scrollButton::tooltip,
-    CResMgr::displaywindows::bibleWindow::previousBook::tooltip
-  );
-	w_book->setWhatsThis(
-    CResMgr::displaywindows::bibleWindow::bookList::whatsthis,
-    CResMgr::displaywindows::bibleWindow::nextBook::whatsthis,
-    CResMgr::displaywindows::general::scrollButton::whatsthis,
-    CResMgr::displaywindows::bibleWindow::previousBook::whatsthis
-  );
-	
-  w_chapter = new CKeyChooserWidget( m_modules.first()->chapterCount(w_book->comboBox()->currentText()),true,this);		
-	w_chapter->setToolTips(
-    CResMgr::displaywindows::bibleWindow::chapterList::tooltip,
-    CResMgr::displaywindows::bibleWindow::nextChapter::tooltip,
-    CResMgr::displaywindows::general::scrollButton::tooltip,
-    CResMgr::displaywindows::bibleWindow::previousChapter::tooltip
-  );
-	w_chapter->setWhatsThis(
-    CResMgr::displaywindows::bibleWindow::chapterList::whatsthis,
-    CResMgr::displaywindows::bibleWindow::nextChapter::whatsthis,
-    CResMgr::displaywindows::general::scrollButton::whatsthis,
-    CResMgr::displaywindows::bibleWindow::previousChapter::whatsthis
-  );
-	
-  w_verse = new CKeyChooserWidget( m_modules.first()->verseCount(w_book->comboBox()->currentText(),1),true,this);
-	w_verse->setToolTips(
-    CResMgr::displaywindows::bibleWindow::verseList::tooltip,
-    CResMgr::displaywindows::bibleWindow::nextVerse::tooltip,
-    CResMgr::displaywindows::general::scrollButton::tooltip,
-    CResMgr::displaywindows::bibleWindow::previousVerse::tooltip
-  );
-	w_verse->setWhatsThis(
-    CResMgr::displaywindows::bibleWindow::verseList::whatsthis,
-    CResMgr::displaywindows::bibleWindow::nextVerse::whatsthis,
-    CResMgr::displaywindows::general::scrollButton::whatsthis,
-    CResMgr::displaywindows::bibleWindow::previousVerse::whatsthis
-  );
-
-	QWidget::setTabOrder(w_book, w_chapter);
-	QWidget::setTabOrder(w_chapter, w_verse);
-	QWidget::setTabOrder(w_verse, 0);
-		
-	layout->addWidget(w_book,0);
-	layout->addWidget(w_chapter,0);
-	layout->addWidget(w_verse,0);
-
-	/* Book connections */
-	connect(w_book,SIGNAL(changed(int))       ,SLOT(bookChanged(int)));
-	connect(w_book,SIGNAL(focusOut(int))      ,SLOT(bookFocusOut(int)));	
-	
-	/* Chapter Connections */
-	connect(w_chapter,SIGNAL(changed(int))    ,SLOT(chapterChanged(int)));
-	connect(w_chapter,SIGNAL(next_requested()),SLOT(chapterNextRequested()));
-	connect(w_chapter,SIGNAL(prev_requested()),SLOT(chapterPrevRequested()));
-	connect(w_chapter,SIGNAL(focusOut(int))   ,SLOT(chapterFocusOut(int)));
-
-
-	/* Verse Connections */
-	connect(w_verse,SIGNAL(changed(int))      ,SLOT(verseChanged(int)));
-	connect(w_verse,SIGNAL(next_requested())  ,SLOT(verseNextRequested()));
-	connect(w_verse,SIGNAL(prev_requested())  ,SLOT(versePrevRequested()));
-	connect(w_verse,SIGNAL(focusOut(int))     ,SLOT(verseFocusOut(int)));
-}
-
-CSwordKey* const CBibleKeyChooser::key(){
-	if (m_key) {
-    const int chapter =  w_chapter->comboBox()->currentText().toInt();
-    const int verse = w_verse->comboBox()->currentText().toInt();
-		m_key->book(w_book->comboBox()->currentText());
-		m_key->Chapter(chapter < 0 ? 0 : chapter);
-		m_key->Verse(verse < 0 ? 0 : verse);
-	}
-	return m_key;
-}
-
-void CBibleKeyChooser::setKey(CSwordKey* key){
-	if ( !(m_key = dynamic_cast<CSwordVerseKey*>(key)) )
-		return;
-
-	emit (beforeKeyChange(m_key->key())); //required to make direct setKey calls work from the outside
-
-	const int chapter = m_key->Chapter();
-	const int verse = m_key->Verse();
-
-	//reset the keychooser parts only if we found a valid book
-	const int count = w_book->comboBox()->count();
-	const QString desiredBook = m_key->book();
-	bool bookIsValid = false;
-	for (int i = 0; i < count; ++i) {
-		if (w_book->comboBox()->text(i) == desiredBook) {
-			bookIsValid = true;
-			break;
-		}
-	}
-
-	if (bookIsValid) {	//we have a valid book
-		if (w_book->comboBox()->currentText() != m_key->book()) { //necessary?
-			w_book->setItem( m_key->book() );
-		}
-
-		w_chapter->reset(m_modules.first()->chapterCount(m_key->book()), chapter-1, false);
-		w_verse->reset(m_modules.first()->verseCount(m_key->book(), chapter), verse-1, false);
-
-    emit keyChanged(m_key);
-	}
-	else {
-  	w_chapter->comboBox()->setCurrentItem(0);
- 		m_key->Chapter(1);
-
-    w_verse->comboBox()->setCurrentItem(0);
-		m_key->Verse(1);
-	}
-}
-
-void CBibleKeyChooser::chapterNextRequested(void){
-	if (!isUpdatesEnabled())
-		return;
-
-	setUpdatesEnabled(false);
-	if (m_key) {
-		emit beforeKeyChange(m_key->key());
-	}
-	if (m_key->next(CSwordVerseKey::UseChapter)) {
-		setKey(m_key);
-	}
-	setUpdatesEnabled(true);
-}
-
-/**  */
-void CBibleKeyChooser::chapterPrevRequested(void){
-	if (!isUpdatesEnabled())
-		return;
-
-	setUpdatesEnabled(false);
-	if (m_key)
-		emit beforeKeyChange(m_key->key());
-
-	if (m_key->previous(CSwordVerseKey::UseChapter))
-		setKey(m_key);
-	setUpdatesEnabled(true);
-}
-
-/**  */
-void CBibleKeyChooser::verseNextRequested(void){
-	if (!isUpdatesEnabled())
-		return;
-	
-	setUpdatesEnabled(false);
-	if (m_key)
-		emit beforeKeyChange(m_key->key());
-
-	if (m_key->next(CSwordVerseKey::UseVerse))
-		setKey(m_key);
-	setUpdatesEnabled(true);
-}
-
-/**  */
-void CBibleKeyChooser::versePrevRequested(void){
-	if (!isUpdatesEnabled())
-		return;
-	
-	setUpdatesEnabled(false);	
-	if (m_key)
-		emit beforeKeyChange(m_key->key());
-
-	if (m_key->previous(CSwordVerseKey::UseVerse))
-		setKey(m_key);
-	setUpdatesEnabled(true);
-}
-
-void CBibleKeyChooser::bookChanged(int /*i*/){
-//	qWarning("CBibleKeyChooser::bookChanged(int /*i*/)");
- 	Q_ASSERT(m_key);
-
-	if (!isUpdatesEnabled())
-		return;
-
-	setUpdatesEnabled(false);
-	if (m_key)
-		emit beforeKeyChange(m_key->key());
-
-	if (m_key->book() != w_book->comboBox()->currentText()) {
-		m_key->book( w_book->comboBox()->currentText() );
-		setKey( m_key );
-	}
-	setUpdatesEnabled(true);
-}
-
-void CBibleKeyChooser::chapterChanged(int /*i*/){
-//	qWarning("CBibleKeyChooser::chapterChanged(int /*i*/)");
-	if (!isUpdatesEnabled())
-		return;
-	
-	setUpdatesEnabled(false);		
-	if (m_key)
-		emit beforeKeyChange(m_key->key());
-//	if (m_key)
-//		emit beforeKeyChange(m_key->key());
-
-	if (m_key->Chapter() != w_chapter->comboBox()->currentText().toInt()) {
-		m_key->Chapter( w_chapter->comboBox()->currentText().toInt() );
-		setKey( m_key );
-	}
-
-	setUpdatesEnabled(true);
-}
-
-void CBibleKeyChooser::verseChanged(int /*i*/){
-//	qDebug("CBibleKeyChooser::verseChanged(int /*i*/)");
-	if (!isUpdatesEnabled())
-		return;	
-	
-	setUpdatesEnabled(false);			
-
-	if (m_key->Verse() != w_verse->comboBox()->currentText().toInt()) {		
-		m_key->Verse( w_verse->comboBox()->currentText().toInt() );	
-		setKey( m_key );
-	}
-	
-	setUpdatesEnabled(true);	
-}
-
-/** Reimplementation */
-QSize CBibleKeyChooser::sizeHint(){
-  return QSize( w_book->sizeHint().width() + w_chapter->sizeHint().width() + w_verse->sizeHint().width(), w_book->sizeHint().height());
-}
-
-/** Reimplementation. */
-void CBibleKeyChooser::refreshContent() {
-  if (!m_modules.count() || !m_modules.first())
-    return;
-
-  w_book->reset( m_modules.first()->books(), w_book->comboBox()->currentItem(), false);
-	setKey(m_key);
-}
-
-/** Sets te module and refreshes the combos */
-void CBibleKeyChooser::setModules(ListCSwordModuleInfo modules, const bool refresh){
-  m_modules.clear();
-  for (modules.first(); modules.current(); modules.next()) {
-    if (modules.current()->type() == CSwordModuleInfo::Bible || modules.current()->type() == CSwordModuleInfo::Commentary) {
-      if (CSwordBibleModuleInfo* bible = dynamic_cast<CSwordBibleModuleInfo*>(modules.current())) {
-        m_modules.append(bible);
-      }
-    }
-  }
-
-  if (refresh)
-    refreshContent();
-}
-
-/** called when the book combo lost the focus with reason == tab @param the new book */
-void CBibleKeyChooser::bookFocusOut(int /*index*/){
-	if (!isUpdatesEnabled())
-		return;
-		
-	setUpdatesEnabled(false);
-	
-	m_key->book( w_book->comboBox()->currentText() );
-	const int chapterCount = m_modules.first()->chapterCount( m_modules.first()->bookNumber(m_key->book()));
-	w_chapter->reset( chapterCount, m_key->Chapter()-1, false);
-			
-	const int verseCount = m_modules.first()->verseCount(m_modules.first()->bookNumber(m_key->book()),m_key->Chapter());
-	w_verse->reset(verseCount,m_key->Verse()-1,false);
-
-	setUpdatesEnabled(true);
-}
-
-/** called when the chapter combo lost the focus with reason == tab @param the new chapter */
-void CBibleKeyChooser::chapterFocusOut(int /*index*/){
-	const int chapter = w_chapter->comboBox()->currentText().toInt();
-	m_key->Chapter( chapter );
-	w_verse->reset(m_modules.first()->verseCount(m_modules.first()->bookNumber(m_key->book()),chapter), 0, false);
-}
-
-/** called when the verse combo lost the focus with reason == tab @param the new verse */
-void CBibleKeyChooser::verseFocusOut(int /*index*/){
-	m_key->Verse( w_verse->comboBox()->currentText().toInt() );
-	setKey( m_key );	
-}
-
-/** No descriptions */
-void CBibleKeyChooser::updateKey(CSwordKey* /*key*/){
-}
-
-/** No descriptions */
-void CBibleKeyChooser::adjustFont(){
-//#warning implement a suitable solution. must be based on locales, not on module->isUnicode. Maybe just do nothing? =)
-}
diff --git a/bibletime/frontend/keychooser/cbiblekeychooser.h b/bibletime/frontend/keychooser/cbiblekeychooser.h
deleted file mode 100644
index 205919c..0000000
--- a/bibletime/frontend/keychooser/cbiblekeychooser.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/***************************************************************************
-                          cbiblekeychooser.h  -  description
-                             -------------------
-    begin                : Wed Sep 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBIBLEKEYCHOOSER_H
-#define CBIBLEKEYCHOOSER_H
-
-#include <qwidget.h>
-#include "ckeychooser.h"
-
-#include "backend/cswordbiblemoduleinfo.h"
-
-class CKeyChooserWidget;
-class CSwordVerseKey;
-
-class CSwordBibleModuleInfo;
-
-class QuickBrowseDialog;
-
-
-/** This class implements the KeyChooser for bibles and commentaries
-	*
-	* it inhertits @ref CKeyChooser
-	*
-	*	it uses 3 @ref CKeyChooserWidget 's to represent the bible keys
-	*
-  * @author The BibleTime team
-  */
-
-class CBibleKeyChooser : public CKeyChooser  {
-   Q_OBJECT
-
-public:
-	/**
-	* the constructor
-	*	you should not need to use this, use @ref CKeyChooser::createInstance instead
-	*/
-	CBibleKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
-
-public slots:
-	/**
-	* see @ref CKeyChooser::getKey
-	*/
-	CSwordKey* const key();
-	/**
-	* see @ref CKeyChooser::setKey
-	*/
-	virtual void setKey(CSwordKey *key);
-  /**
- 	* Reimplementation
- 	*/
-  virtual QSize sizeHint();
-  /**
-  * Sets te module and refreshes the combos
-  */
-  virtual void setModules(ListCSwordModuleInfo modules, const bool refresh = true);
-  /**
- 	* Reimplementation.
- 	*/
-  void refreshContent();
-	/**
-	* used to react to changes in the 3 @ref CKeyChooserWidget 's
-	* @param index not used
-	*/
-	void bookChanged(int index);
-	/**
-	* used to react to changes in the 3 @ref CKeyChooserWidget 's
-	* @param index not used
-	*/
-	void chapterChanged(int index);
-	/**
-	* used to react to changes in the 3 @ref CKeyChooserWidget 's
-	* @param index not used
-	*/
-	void verseChanged(int index);	
-  /**
- 	* see @ref bookPrevRequested
- 	*/
-  void chapterPrevRequested(void);
-  /**
- 	* see @ref bookPrevRequested
- 	*/
-  void chapterNextRequested(void);
-  /**
- 	* see @ref bookPrevRequested
- 	*/
-  void versePrevRequested(void);
-  /**
- 	* see @ref bookPrevRequested
- 	*/
-  void verseNextRequested(void);
-  void updateKey(CSwordKey* key);
-
-
-protected:
-  virtual void adjustFont();
-
-private:
-	CKeyChooserWidget* w_book;
-	CKeyChooserWidget* w_chapter;
-	CKeyChooserWidget* w_verse;
-	QPtrList<CSwordBibleModuleInfo> m_modules;
-	CSwordVerseKey *m_key;
-
-private slots: // Private slots
-  /**
-  *	called when the book combo lost the focus with reason == tab
-  * @param the new book
-  */
-  void bookFocusOut(int);
-  /**
-  * called when the chapter combo lost the focus with reason == tab
-  * @param the new chapter
-  */
-  void chapterFocusOut(int);
-  /** called when the verse combo lost the focus
-  with reason == tab
-  @param the new verse
-  */
-  void verseFocusOut(int);
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/cbookkeychooser.cpp b/bibletime/frontend/keychooser/cbookkeychooser.cpp
deleted file mode 100644
index 315cab0..0000000
--- a/bibletime/frontend/keychooser/cbookkeychooser.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/***************************************************************************
-                          cbookkeychooser.cpp  -  description
-                             -------------------
-    begin                : Sat Jan 26 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cbookkeychooser.h"
-#include "backend/cswordtreekey.h"
-#include "backend/cswordbookmoduleinfo.h"
-#include "frontend/cbtconfig.h"
-
-//Qt includes
-#include <qlayout.h>
-#include <qmap.h>
-
-QMap<QObject*, int> boxes;
-
-CBookKeyChooser::CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name)
-	: CKeyChooser(modules, key, parent,name), m_layout(0) {
-
-  setModules(modules, false);
-	m_key = dynamic_cast<CSwordTreeKey*>(key);
-  if (!m_modules.count()) {
-		m_key = 0;
-	}
-  setModules(modules, true);
-	adjustFont();
-}
-
-CBookKeyChooser::~CBookKeyChooser(){
-}
-
-void CBookKeyChooser::setKey(CSwordKey* newKey){
-	setKey(newKey, true);
-}
-
-/** Sets a new key to this keychooser */
-void CBookKeyChooser::setKey(CSwordKey* newKey, const bool emitSignal){
-	if (m_key != newKey )
-		m_key = dynamic_cast<CSwordTreeKey*>(newKey);
-	
-	const QString oldKey = m_key->key();
-	QStringList siblings;
-	if (m_key && !oldKey.isEmpty())
-		siblings = QStringList::split("/",oldKey,false);
-
-	int depth = 0;
-	int index = 0;
-	
-	m_key->root();
-	while( m_key->firstChild() && (depth <= int(siblings.count())) ) {
-		const QString key = m_key->key();
-		index = 0;
-		const QString sibling = siblings[depth];
-		if (!sibling.isEmpty()) { //found it
-			bool found = false;			
-			do {
-				++index;
-				found = (m_key->getLocalName() == sibling);
-			} while (!found && m_key->nextSibling());			
-			if (!found)
-				m_key->key( key );
-		}	
-		setupCombo(key, depth++, index);		
-	}
-	
-	//clear the combos which were not filled
-	for (; depth < m_modules.first()->depth(); ++depth)  {
-		CKeyChooserWidget* chooser = m_chooserWidgets.at(depth);
-		if (chooser)
-			chooser->reset(0,0,false);
-	}
-	
-	if (oldKey.isEmpty())
-		m_key->root();
-	else
-		m_key->key(oldKey);
-
-	if (emitSignal)
-		emit keyChanged(m_key);
-}
-
-/** Returns the key of this kechooser. */
-CSwordKey* const CBookKeyChooser::key(){
-	return m_key;
-}
-
-/** Sets another module to this keychooser */
-void CBookKeyChooser::setModules(ListCSwordModuleInfo modules, const bool refresh){
-  m_modules.clear();
-  for (modules.first(); modules.current(); modules.next()) {
-    if ( modules.current()->type() == CSwordModuleInfo::GenericBook ) {
-      if (CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(modules.current())) {
-        m_modules.append(book);
-      }
-    }
-  }
-
-	//refresh the number of combos
-	if (refresh && m_modules.count() && m_key) {
-		if (!m_layout)
-			m_layout = new QHBoxLayout(this);
-
-		//delete old widgets
-		m_chooserWidgets.setAutoDelete(true);
-		m_chooserWidgets.clear();
-		m_chooserWidgets.setAutoDelete(false);
-		
-		for (int i = 0; i < m_modules.first()->depth(); ++i) {			
-			CKeyChooserWidget* w = new CKeyChooserWidget(0, false, this); //empty keychooser
-			m_chooserWidgets.append( w );
-			connect(w, SIGNAL(changed(int)), SLOT(keyChooserChanged(int)));
-
-			// make sure the boxes don't become too broad.
-			w->comboBox()->setMaximumWidth(200);
-			m_layout->addWidget(w);
-
-      boxes[w] = i;
-
-			w->show();
-		}
-		updateKey(m_key);
-		adjustFont(); // only when refresh is set.		
-	}
-}
-
-/** No descriptions */
-void CBookKeyChooser::adjustFont(){
- 	//Make sure the entries are displayed correctly.
-	for ( CKeyChooserWidget* idx = m_chooserWidgets.first(); idx; idx = m_chooserWidgets.next() ) {
-		idx->comboBox()->setFont( CBTConfig::get( m_modules.first()->language() ).second );
-	}
-}
-
-/** Refreshes the content. */
-void CBookKeyChooser::refreshContent(){
-	if (m_key)
-		updateKey( m_key ); //refresh with current key
-}
-
-void CBookKeyChooser::setupCombo(const QString key, const int depth, const int currentItem){
-	CKeyChooserWidget* chooserWidget = m_chooserWidgets.at(depth);
-	if ((depth == 0) && chooserWidget && chooserWidget->comboBox()->count()) { //has already items
-		//set now the right item		
-		if (CKeyChooserWidget* chooserWidget = m_chooserWidgets.at(depth)) {
-			chooserWidget->setItem( chooserWidget->comboBox()->text(currentItem) );
-		}
-		return;
-	}
-	
-	const QString oldKey = m_key->key();	
-	m_key->key(key);
-	
-	//insert an empty item at the top
-	QStringList items;	
-	items << QString::null;
-	do {
-		items << QString::fromLocal8Bit(m_key->getLocalName());
-	}
-	while (m_key->nextSibling());
-		
-	if (chooserWidget) {
-		chooserWidget->reset(items,currentItem,false);
-	}
-	
-	//restore old key
-	m_key->key(oldKey);	
-}
-
-/** A keychooser changed. Update and emit a signal if necessary. */
-void CBookKeyChooser::keyChooserChanged(int /*newIndex*/){
-  const int activeID = boxes[const_cast<QObject*>(sender())]; //no so good code!
-	
-  QStringList items;
-	CKeyChooserWidget* chooser;
-	const int count = m_chooserWidgets.count();
-	for (int i = 0; i < count; ++i) {
-		chooser = m_chooserWidgets.at(i);
-		const QString currentText = (chooser && chooser->comboBox()) ? chooser->comboBox()->currentText() : QString::null;
-		if (currentText.isEmpty() || i > activeID) {
-			break;
-    }
-		items << currentText;
-	}
-
-	QString newKey = QString::fromLatin1("/") + items.join("/");
-	if (newKey.length() > 1)
-		newKey.remove(newKey.length(),1); //remove the traling slash
-	
-	m_key->key(newKey);
-	setKey(m_key);
-}
-
-/** Updates the keychoosers for the given key but emit no signal. */
-void CBookKeyChooser::updateKey(CSwordKey* key){
-	setKey(key, false);
-}
-
diff --git a/bibletime/frontend/keychooser/cbookkeychooser.h b/bibletime/frontend/keychooser/cbookkeychooser.h
deleted file mode 100644
index 08cabf5..0000000
--- a/bibletime/frontend/keychooser/cbookkeychooser.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************
-                          cbookkeychooser.h  -  description
-                             -------------------
-    begin                : Sat Jan 26 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBOOKKEYCHOOSER_H
-#define CBOOKKEYCHOOSER_H
-
-//BibleTime includes
-#include "ckeychooser.h"
-#include "ckeychooserwidget.h"
-
-//Sword includes
-
-//Qt includes
-#include <qwidget.h>
-#include <qsize.h>
-#include <qmap.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
-
-class CSwordKey;
-class CSwordBookModuleInfo;
-class CSwordTreeKey;
-
-class TreeKeyIdx;
-
-class QHBoxLayout;
-
-/** The keychooser implementation for books.
-  * @author The BibleTime team
-  */
-class CBookKeyChooser : public CKeyChooser  {
-   Q_OBJECT
-public: 
-	CBookKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
-	~CBookKeyChooser();
-  /**
-  * Refreshes the content.
-  */
-  virtual void refreshContent();
-  /**
-  * Sets another module to this keychooser
-  */
-  virtual void setModules(ListCSwordModuleInfo modules, const bool refresh = false);
-  /**
-  * Returns the key of this kechooser.
-  */
-  virtual CSwordKey* const key();
-  /**
-  * Sets a new key to this keychooser
-  */
-  virtual void setKey(CSwordKey*);
-  /**
-  * Sets a new key to this keychooser
-  */
-  void setKey(CSwordKey*, const bool emitSignal);
-
-
-public slots: // Public slots
-  /**
-  * Updates the keychoosers for the given key but emit no signal.
-  */
-  void updateKey(CSwordKey*);
-
-protected: // Protected methods
-  /**
-  * Fills the combo given by depth with the items from the key having depth "depth".
-	* The parent sibling is given by key.
-	*/
-  void setupCombo(const QString key, const int depth, const int currentItem);
-  /** No descriptions */
-  virtual void adjustFont();
-
-protected slots:
-  /**
-  * A keychooser changed. Update and emit a signal if necessary.
-  */
-  void keyChooserChanged(int);
-  //is called when a keychooser widget wants to jump to the next/previous key
-//  void nextEntry();
-//  void previousEntry();
-
-private:
-	QPtrList<CKeyChooserWidget> m_chooserWidgets;	
-	QPtrList<CSwordBookModuleInfo> m_modules;
-	CSwordTreeKey *m_key;
-	QHBoxLayout* m_layout;
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/cbooktreechooser.cpp b/bibletime/frontend/keychooser/cbooktreechooser.cpp
deleted file mode 100644
index 071e808..0000000
--- a/bibletime/frontend/keychooser/cbooktreechooser.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-/***************************************************************************
-                          cbooktreechooser.cpp  -  description
-                             -------------------
-    begin                : Sat Jan 26 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cbooktreechooser.h"
-#include "backend/cswordtreekey.h"
-#include "backend/cswordbookmoduleinfo.h"
-#include "frontend/cbtconfig.h"
-
-//Qt includes
-#include <qlayout.h>
-#include <qheader.h>
-#include <qlistview.h>
-#include <qcursor.h>
-
-//KDE includes
-#include <kapplication.h>
-
-////////////
-
-CBookTreeChooser::TreeItem::TreeItem(QListViewItem* parent, QListViewItem* after, CSwordTreeKey* key, const QString keyName)
-	: KListViewItem(parent, after),
-  m_key(key),
-  m_keyName(keyName)
-{	
-  m_key->key(m_keyName);
-  setText(0, QString::fromLatin1(m_key->getLocalName()) );
-};
-
-CBookTreeChooser::TreeItem::TreeItem(QListViewItem* parent,CSwordTreeKey* key, const QString keyName)
-	: KListViewItem(parent),
-  m_key(key),
-  m_keyName(keyName)
-{	
-  m_key->key(m_keyName);
-  setText(0, QString::fromLatin1(m_key->getLocalName()) );
-};
-
-CBookTreeChooser::TreeItem::TreeItem(QListView* view, QListViewItem* after,CSwordTreeKey* key, const QString keyName)
-	: KListViewItem(view,after),
-  m_key(key),
-  m_keyName(keyName)
-{	
-  m_key->key(m_keyName);
-  setText(0, QString::fromLatin1(m_key->getLocalName()) );
-};
-
-const QString& CBookTreeChooser::TreeItem::key() const {
-	return m_keyName;
-};	
-
-/** Initializes this item with the correct caption. */
-void CBookTreeChooser::TreeItem::setup() {
-  m_key->key(m_keyName);
-  setExpandable(m_key->hasChildren());
-
-  KListViewItem::setup();
-}
-
-void CBookTreeChooser::TreeItem::createChilds() {
-  m_key->key(m_keyName);
-  m_key->firstChild();
-  QListViewItem* oldItem = 0;
-  do {
-    if (oldItem)
-      oldItem = new TreeItem(this, oldItem, m_key, m_key->key());
-    else
-      oldItem = new TreeItem(this, m_key, m_key->key());
-  } while (m_key->nextSibling());
-}
-
-
-void CBookTreeChooser::TreeItem::setOpen(bool o) {
-  //setup the tree under this item
-  if ((!isOpen() && o) && childCount() == 0) {
-    listView()->viewport()->setCursor(WaitCursor);
-    createChilds();
-    listView()->viewport()->unsetCursor();
-  }
-  KListViewItem::setOpen(o);
-}
-
-//////////////////////////////////
-
-CBookTreeChooser::CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name)
-	: CKeyChooser(modules, key, parent,name) {
-  setModules(modules, false);	
-  m_key = dynamic_cast<CSwordTreeKey*>(key);
-  if (!modules.count()) {
-		m_modules.clear();
-		m_key = 0;
-	}
-
-	//now setup the keychooser widgets
-	QHBoxLayout* layout = new QHBoxLayout(this);
-	
-  m_treeView = new KListView(this);
-	layout->addWidget(m_treeView);	
-//	connect( m_treeView, SIGNAL(executed(QListViewItem*)), SLOT(itemClicked(QListViewItem*)));
-	connect( m_treeView, SIGNAL(selectionChanged(QListViewItem*)), SLOT(itemActivated(QListViewItem*)));  
-	m_treeView->addColumn("Tree");	
-	m_treeView->header()->resizeSection( 0,m_treeView->sizeHint().width());
-	m_treeView->header()->setResizeEnabled(-1);
-	m_treeView->header()->hide();
-	m_treeView->setSorting(-1);
-	m_treeView->setRootIsDecorated(true);
-  m_treeView->setFullWidth(true);
-
-  adjustFont();
-}
-
-CBookTreeChooser::~CBookTreeChooser(){
-}
-
-/** Sets a new key to this keychooser */
-void CBookTreeChooser::setKey(CSwordKey* /*newKey*/){
-}
-
-/** Sets a new key to this keychooser */
-void CBookTreeChooser::setKey(CSwordKey* newKey, const bool emitSignal){
- 	if (m_key != newKey )
-		m_key = dynamic_cast<CSwordTreeKey*>(newKey);
-	
-	const QString key = m_key->key();
-	
-	QStringList siblings;
-	if (m_key && !key.isEmpty())
-		siblings = QStringList::split("/",key,false);
-	
-	//find the right listview item
-	const int count = siblings.count();
-	int index = 0;
-	QString currentSibling = siblings[index];
-	
-  QListViewItem* child = m_treeView->firstChild();
-  while( child && index < count ) {
-  	if (child->text(0) == currentSibling) { //found a parent of our item
-  		//found right entry?
-  		TreeItem* i = dynamic_cast<TreeItem*>(child);
-  		if (!i || i->key() == key) {
-  			break;
-  		}
-  		i->setOpen(true); //automatically creates childs
-      child = i->firstChild();
-  		currentSibling = siblings[++index];
-  	}
-  	else
-			child = child->nextSibling();
-  }
-	
-  m_treeView->setCurrentItem( child );
-  m_treeView->ensureItemVisible(child);
-	if (emitSignal)
-		emit keyChanged(m_key);
-}
-
-/** Returns the key of this kechooser. */
-CSwordKey* const CBookTreeChooser::key(){
-	return m_key;
-}
-
-/** Sets another module to this keychooser */
-void CBookTreeChooser::setModules(ListCSwordModuleInfo modules, const bool refresh){
-  m_modules.clear();
-  for (modules.first(); modules.current(); modules.next()) {
-    if (CSwordBookModuleInfo* book = dynamic_cast<CSwordBookModuleInfo*>(modules.current())) {
-      m_modules.append(book);
-    }
-  }
-	
-	if (refresh && m_modules.count() && m_key) {
-    setupTree();
-//		m_treeView->clear();
-//	
-//    const QString oldKey = m_key->key();
-//		m_key->root();
-//		m_key->firstChild();
-//		setupTree(0,0,m_key);
-//
-//    m_key->key(oldKey);
-//		
-//		updateKey(m_key);
-		adjustFont(); //only when refresh is set.
-	}
-}
-
-/** No descriptions */
-void CBookTreeChooser::adjustFont(){
-  //Make sure the entries are displayed correctly.
-//	if ( m_modules.first()->isUnicode() ){
-		m_treeView->setFont( CBTConfig::get(m_modules.first()->language()).second );
-//		qWarning("Unicode Book detected");
-//	}
-//	else{
-//		m_treeView->setFont( CBTConfig::get(CBTConfig::standard) );
-//		qWarning("Standard Book detected");
-//	}
-}
-
-
-/** Refreshes the content. */
-void CBookTreeChooser::refreshContent(){
-	if (m_key)
-		updateKey( m_key ); //refresh with current key
-}
-
-/** Set up the tree with the current level of key. */
-void CBookTreeChooser::setupTree( QListViewItem* parent, QListViewItem* after, CSwordTreeKey* key ){
-	QListViewItem* item = 0;
-	if (parent)
-		item = new TreeItem(parent, after, key, key->key());
-	else
-		item = new TreeItem(m_treeView, after, key, key->key());
-	
-	if (key->nextSibling())
-		setupTree(parent, item, key);
-}
-
-/** No descriptions */
-void CBookTreeChooser::itemActivated( QListViewItem* item ){
-	TreeItem* i = dynamic_cast<TreeItem*>(item);
-	if (!i)
-    return;
-	m_key->key(i->key());
-  if (i->childCount() > 0 || i->isExpandable())
-    i->setOpen(true);
-
-  emit keyChanged(m_key);      
-}
-
-/** No descriptions */
-void CBookTreeChooser::updateKey( CSwordKey* key ){	
-	setKey(key, false);
-}
-
-/** Reimplementationm to handle tree creation on show. */
-void CBookTreeChooser::show(){
-  CKeyChooser::show();
-  if (!m_treeView->childCount()) {
-    KApplication::setOverrideCursor(WaitCursor);
-    setupTree(); //create the first level of the tree structure
-    m_treeView->resize(m_treeView->sizeHint());
-    KApplication::restoreOverrideCursor();
-  }
-}
-
-/** Creates the first level of the tree structure. */
-void CBookTreeChooser::setupTree(){
- 	m_treeView->clear();
-	
-  const QString oldKey = m_key->key();
- 	m_key->root();
- 	m_key->firstChild();
- 	setupTree(0,0,m_key);
-
-  m_key->key(oldKey);
-		
-  updateKey(m_key);
-}
diff --git a/bibletime/frontend/keychooser/cbooktreechooser.h b/bibletime/frontend/keychooser/cbooktreechooser.h
deleted file mode 100644
index bcbf46c..0000000
--- a/bibletime/frontend/keychooser/cbooktreechooser.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/***************************************************************************
-                          cbooktreechooser.h  -  description
-                             -------------------
-    begin                : Sat Jan 26 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CBOOKTREECHOOSER_H
-#define CBOOKTREECHOOSER_H
-
-
-/** The treechooser implementation for books.
-  * @author The BibleTime team
-  */
-//BibleTime includes
-#include "ckeychooser.h"
-#include "ckeychooserwidget.h"
-
-//Sword includes
-
-//Qt includes
-#include <qwidget.h>
-#include <qsize.h>
-#include <qmap.h>
-#include <qptrlist.h>
-#include <qstringlist.h>
-
-//KDE includes
-#include <klistview.h>
-
-class CSwordKey;
-class CSwordBookModuleInfo;
-class CSwordTreeKey;
-
-class TreeKeyIdx;
-
-/** The keychooser implementeation for books.
-  * @author The BibleTime team
-  */
-class CBookTreeChooser : public CKeyChooser  {
-   Q_OBJECT
-public:
-	CBookTreeChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
-	~CBookTreeChooser();
-  /**
-  * Refreshes the content.
-  */
-  virtual void refreshContent();
-  /**
-  * Sets another module to this keychooser
-  */
-  virtual void setModules(ListCSwordModuleInfo modules, const bool refresh = true);
-  /**
-  * Returns the key of this kechooser.
-  */
-  virtual CSwordKey* const key();
-  /**
-  * Sets a new key to this keychooser
-  */
-  virtual void setKey(CSwordKey*);
-  void setKey(CSwordKey*, const bool emitSinal);
-
-public slots: // Public slots
-  virtual void updateKey( CSwordKey* );
-  /**
-  * Reimplementationm to handle tree creation on show.
-  */
-  virtual void show();
-
-
-protected: // Protected methods
-  /**
-  * Set up the tree with the current level of key.
-  */
-  void setupTree( QListViewItem* parent,QListViewItem* after, CSwordTreeKey* key );
-  /**
-  * Creates the first level of the tree structure.
-  */
-  void setupTree();
-  virtual void adjustFont();
-
-protected slots: // Protected slots
-  void itemActivated( QListViewItem* item );
-
-private:
-	class TreeItem : public KListViewItem {
-		public:
-			TreeItem(QListViewItem* parent, QListViewItem* after, CSwordTreeKey* key, const QString keyName);
-			TreeItem(QListViewItem* parent, CSwordTreeKey* key, const QString keyName);
-			TreeItem(QListView* view,QListViewItem* after, CSwordTreeKey* key, const QString keyName);
-			const QString& key() const;
-      void createChilds();
-      virtual void setOpen(bool);
-      
-    protected:
-      /**
-      * Initializes this item with the correct caption.
-      */
-      virtual void setup();
-		private:
-			CSwordTreeKey* m_key;
-      QString m_keyName;
-	};
-
-	QPtrList<CSwordBookModuleInfo>	m_modules;
-	CSwordTreeKey* m_key;
-	KListView* m_treeView;
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/cfx_btn.cpp b/bibletime/frontend/keychooser/cfx_btn.cpp
deleted file mode 100644
index fdbfa5d..0000000
--- a/bibletime/frontend/keychooser/cfx_btn.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/***************************************************************************
-                          cfx_btn.cpp  -  description
-                             -------------------
-    begin                : Tue Sep 19 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cfx_btn.h"
-#include "../cbtconfig.h"
-
-#include <stdlib.h>
-#include <math.h>
-
-//Qt includes
-#include <qevent.h>
-#include <qapplication.h>
-#include <qcursor.h>
-
-cfx_btn::cfx_btn(QWidget *parent, const char *name ) : QToolButton(parent,name) {
-	setFocusPolicy(QWidget::WheelFocus);
-	setCursor( splitVCursor );
-		
-	m_isLocked = false;
-	connect(this, SIGNAL(pressed() ), SLOT(was_pressed() ));
-	connect(this, SIGNAL(released()), SLOT(was_released()));
-}
-
-const bool cfx_btn::isLocked( ) const {
-	return m_isLocked;
-}
-
-void cfx_btn::was_pressed( ){
-	QApplication::setOverrideCursor( BlankCursor );
-	m_isLocked = true;
-	lock_Point = get_lock_Point();
-	
-	emit lock();
-}
-
-void cfx_btn::was_released( ){
-	QApplication::restoreOverrideCursor();
-	m_isLocked = false;
-	
-	emit unlock();
-}
-
-const QPoint cfx_btn::get_lock_Point() const {
-	return mapToGlobal( QPoint( width()/2, height()/2 ) );
-}
-
-void cfx_btn::mouseMoveEvent( QMouseEvent* e ){
- 	const short signed int scrollDirection = CBTConfig::get(CBTConfig::scroll) ? -1 : 1;
-	
-	if (m_isLocked) {
-		int vchange = (QCursor::pos().y() - lock_Point.y()) * scrollDirection;
-		if (abs(vchange) < 10)
-      vchange = (int)((vchange>0 ? -1 : 1) * pow(abs(vchange), 0.3));
-		else if (abs(vchange) < 30)
-      vchange = (int)((vchange>0 ? -1 : 1) * pow(abs(vchange), 0.6));
-		else if (abs(vchange) < 40)
-      vchange = (int)((vchange>0 ? -1 : 1) * pow(abs(vchange), 1.2));
-		else
-      vchange = (int)((vchange>0 ? -1 : 1) * pow(abs(vchange), 2.0));
-
-		if (vchange) //not emit 0
-			emit change_requested( vchange );
-		QCursor::setPos( lock_Point );
-	}
-	else
-		QToolButton::mouseMoveEvent(e);
-}
-
-
-
-/** If the wheel of the mouse is used while the mouse stays over our scrollbutton the content is  scrolled like the mouse was pressed and moved. */
-void cfx_btn::wheelEvent( QWheelEvent* e ){
-	/**
-	* The problem is, that wheel events do everytime have the delta value 120
-	*/
- 	const short signed int scrollDirection = CBTConfig::get(CBTConfig::scroll) ? -1 : 1;	
- 	
-	const int vchange = scrollDirection * ((e->delta() > 0) ? (1) : (-1));
-	if (vchange!=0) {//do not emit a change with value 0	
-		emit change_requested( vchange );
-		e->accept();			
-	}
-	else
-		e->ignore();
-}
diff --git a/bibletime/frontend/keychooser/cfx_btn.h b/bibletime/frontend/keychooser/cfx_btn.h
deleted file mode 100644
index 7f40002..0000000
--- a/bibletime/frontend/keychooser/cfx_btn.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/***************************************************************************
-                          cfx_btn.h  -  description
-                             -------------------
-    begin                : Tue Sep 19 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CFX_BTN_H
-#define CFX_BTN_H
-
-#include <qwidget.h>
-#include <qtoolbutton.h>
-
-class QMouseEvent;
-
-/** This Class implements the direct chooser button used in the KeyChooser Widget
-  * @author The BibleTime team
-  */
-class cfx_btn : public QToolButton  {
-   Q_OBJECT
-public:
-	/**
-	* The constructor
-	*/
-	cfx_btn(QWidget *parent=0, const char *name=0);
-  const bool isLocked() const;
-	
-signals:
-	/**
-	* is emitted when the button enters locked state
-	*/
-	void lock();
-	/**
-	* is emitted when the button leaves locked state
-	*/	
-	void unlock();
-	/**
-	* indicates a change the user made by moving the mouse
-	* @param count the number of items to be changed in the KeyChooser ComboBox
-	*/
-	void change_requested(int count);
-
-protected slots:
-	/*
-	* used to process the button press events
-	*/
-	void was_pressed();
-	/**
-	* used to process the button release events
-	*/
-	void was_released();
-
-protected:
-	/**
-	* Reimplementation from @ref QWidget#mouseMoveEvent - processes
-	* the mouse move events
-	*/
-	virtual void mouseMoveEvent( QMouseEvent* e );
-	/**
-	* used to find the lock point - the middle of the button
-	* @return the lock point
-	*/
-	const QPoint get_lock_Point() const;
-  /**
-  * If the wheel of the mouse is used while the mouse stays over our scrollbutton the content is
-	* scrolled like the mouse was pressed and moved.
-	*/
-  virtual void wheelEvent( QWheelEvent* e );
-	
-private:
-	/**
-	* Indicates whether the button is in locked state or not
-	*/
-  bool m_isLocked;
-	/**
-	* stores the lock point
-	*/	
-	QPoint lock_Point;	
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/ckeychooser.cpp b/bibletime/frontend/keychooser/ckeychooser.cpp
deleted file mode 100644
index 4a4ff49..0000000
--- a/bibletime/frontend/keychooser/ckeychooser.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/***************************************************************************
-                          ckeychooser.cpp  -  description
-                             -------------------
-    begin                : Wed Sep 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "ckeychooser.h"
-#include "../../backend/cswordmoduleinfo.h"
-#include "../../backend/cswordbiblemoduleinfo.h"
-#include "../../backend/cswordcommentarymoduleinfo.h"
-#include "../../backend/cswordlexiconmoduleinfo.h"
-
-#include "clexiconkeychooser.h"
-#include "cbiblekeychooser.h"
-#include "cbookkeychooser.h"
-
-CKeyChooser::CKeyChooser(ListCSwordModuleInfo, CSwordKey *, QWidget *parent, const char *name )
-	: QWidget(parent, name){
-}
-
-CKeyChooser* CKeyChooser::createInstance(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent){	
-	if (!modules.count())
-		return 0;
-
-  CKeyChooser* ck = 0;
- 	switch ( modules.first()->type() ){
- 	  case CSwordModuleInfo::Commentary:	 //Bibles and commentaries uise the same key chooser
- 	  case CSwordModuleInfo::Bible:
- 	  	ck = new CBibleKeyChooser(modules,key,parent);
-      break;
- 	  case CSwordModuleInfo::Lexicon:
-			ck = new CLexiconKeyChooser(modules,key,parent);	
-      break;
- 	  case CSwordModuleInfo::GenericBook:
- 	  	ck = new CBookKeyChooser(modules,key,parent);
-      break;
- 	  default:
- 	  	return 0;
- 	}
-  return ck;
-}
diff --git a/bibletime/frontend/keychooser/ckeychooser.h b/bibletime/frontend/keychooser/ckeychooser.h
deleted file mode 100644
index b0979d6..0000000
--- a/bibletime/frontend/keychooser/ckeychooser.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/***************************************************************************
-                          ckeychooser.h  -  description
-                             -------------------
-    begin                : Wed Sep 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CKEYCHOOSER_H
-#define CKEYCHOOSER_H
-
-#include <qwidget.h>
-
-#include "backend/cswordmoduleinfo.h"
-
-class CSwordModuleInfo;
-class CSwordKey;
-
-/**
-	* The base class for the KeyChooser.
-	* Do not use directly, create a KeyChooser with
-	* @ref #createInstance , this will create the proper one
-	* of the classes that inherit from @ref CKeyChooser
-	*
-  * @author The BibleTime team
-  */
-
-class CKeyChooser : public QWidget {
-   Q_OBJECT
-
-public:
-  /**
-  * Creates a proper Instance, either
-	*
-	 @ref CLexiconKeyChooser or
-	* @ref CBibleKeyChooser
-	* @param info the @ref CModuleInfo to be represented by the KeyChooser
-	* @param key if not NULL, the @ref CKey the KeyChooser should be set to
-	* @param parent the parent of the widget to create
-	*/
-  static CKeyChooser* createInstance(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent);
-
-signals:
-	/**
-	* is emitted if the @ref CKey was changed by the user
-	*/
-	void keyChanged(CSwordKey* key);
-	/**
-	* Is emitted before the key is changed!
-	*/
-	void beforeKeyChange(const QString& key);
-	
-public slots:
-	/**
-	* sets the @ref CKey
-	* @param key the key which the widget should be set to
-	*/
-	virtual void setKey(CSwordKey* key) = 0;
-	/**
-	* sets the @ref CKey
-	* @param key the key which the widget should be set to
-	*/
-	virtual void updateKey(CSwordKey* key) = 0;	
-	/**
-	* gets the current @ref CKey
-	*
-	* @return the current @ref CKey
-	*/
-  virtual CSwordKey* const key() = 0;	
-  /**
-  * Sets the module of this keychooser and refreshes the comboboxes
-  */
-  virtual void setModules( ListCSwordModuleInfo modules, const bool refresh = true ) = 0;
-  /**
-  * Freshes the content of the different key chooser parts.
-  */
-  virtual void refreshContent() = 0;
-
-protected:
-	/**
-	* the constructor - DO NOT USE! -- use @ref #createInstance instead!
-	*/
-	CKeyChooser(ListCSwordModuleInfo info, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
-  /**
-  * Set the appropriate font do display the modules
-  */
-  virtual void adjustFont() = 0;
-
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.cpp b/bibletime/frontend/keychooser/ckeychooserwidget.cpp
deleted file mode 100644
index e4723eb..0000000
--- a/bibletime/frontend/keychooser/ckeychooserwidget.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-/***************************************************************************
-                          ckeychooserwidget.cpp  -  description
-                             -------------------
-    begin                : Tue Sep 19 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-//BibleTime includes
-#include "ckeychooserwidget.h"
-#include "cfx_btn.h"
-#include "../cbtconfig.h"
-
-//Qt includes
-#include <qlineedit.h>
-#include <qstring.h>
-#include <qstringlist.h>
-#include <qlistbox.h>
-#include <qtoolbutton.h>
-#include <qevent.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qstyle.h>
-#include <qpixmap.h>
-#include <qapplication.h>
-#include <qwhatsthis.h>
-#include <qtooltip.h>
-#include <qrect.h>
-
-const unsigned int WIDTH = 16;
-const unsigned int ARROW_HEIGHT = 12;
-const unsigned int MOVER_HEIGHT = 6;
-
-CKCComboBox::CKCComboBox(bool rw,QWidget* parent,const char* name)
-  : QComboBox(rw,parent,name){
-	setFocusPolicy(QWidget::WheelFocus);
-  if (lineEdit()) {
-  	installEventFilter( lineEdit() );
-  }
-}
-
-/** Reimplementation. */
-bool CKCComboBox::eventFilter( QObject *o, QEvent *e ){			
-//	qWarning("CKCComboBox::eventFilter( QObject *o, QEvent *e )");
-	if (e->type() == QEvent::FocusOut) {
-		QFocusEvent* f = static_cast<QFocusEvent*>(e);
-		if (o == lineEdit() && f->reason() == QFocusEvent::Tab) {
-	    int index = listBox()->index( listBox()->findItem(currentText()) );
-	    if (index == -1)
-				index = 0;// return 0 if not found
-	  	setCurrentItem( index );	
-	    emit focusOut( index );  	
-	  }
-	  else if (/*o == lineEdit() &&*/ f->reason() == QFocusEvent::Popup) {
-			return false;
-		}
-	  else if (/*o == lineEdit() && */f->reason() == QFocusEvent::ActiveWindow) {
-			emit activated(currentText());
-			return true;
-		}
-	  else if (/*o == lineEdit() &&*/ f->reason() == QFocusEvent::Mouse) {
-			emit activated(currentText());
-			return true;
-		}		
-	  else if (o == listBox()) {  //???
-			return false;
-		}
-	  else if (o == this) {
-			emit activated(currentText());
-			return true;
-		}		
-	}
-//	qWarning("not handled!");
-  return QComboBox::eventFilter(o,e);	
-}
-
-/** Scrolls in the list if the wheel of the mouse was used. */
-void CKCComboBox::wheelEvent( QWheelEvent* e ) {
-	const signed int change = (int)((float)e->delta()/(float)120);
-	int current = currentItem();
-	
-	if ((current+change >= 0) && (current+change<count()) ) {
-		setCurrentItem(current+change);
-		e->accept();
-		emit activated( currentItem() );
-	}
-	else {
-		e->ignore();
-	}
-}
-
-//**********************************************************************************/
-
-CKeyChooserWidget::CKeyChooserWidget(int count, const bool useNextPrevSignals,  QWidget *parent, const char *name) : QWidget(parent,name) {
-	m_useNextPrevSignals = useNextPrevSignals;
-	for (int index=1; index <= count; index++)
-		m_list.append( QString::number(index) );	
-	init();
-	reset(m_list,0,false);
-};
-
-CKeyChooserWidget::CKeyChooserWidget(QStringList *list, const bool useNextPrevSignals, QWidget *parent, const char *name ) : QWidget(parent,name) {
-	m_useNextPrevSignals = useNextPrevSignals;		
-	if (list)
-		m_list = *list;//copy the items of list
-	else
-		m_list.clear();
-	init();
-	reset(m_list,0,false);	
-}
-
-void CKeyChooserWidget::changeCombo(int i){
-	if (!isUpdatesEnabled())
-		return;
-	setUpdatesEnabled(false);
-	
-	int current = comboBox()->currentItem();
-
-	//index of highest Item
-	const int count = comboBox()->count()-1;
-	int j = current + i;
-	if (i > 0){
-		if (j <= count)
-			comboBox()->setCurrentItem(j);
-		else
-			comboBox()->setCurrentItem(count);
-	}
-	else if (i < 0){
-		if (j>=0)
-			comboBox()->setCurrentItem(j);
-		else
-			comboBox()->setCurrentItem(0);
-	}	
-	if (!isResetting && !btn_fx->isLocked() && (current != comboBox()->currentItem()))	
-		emit changed(comboBox()->currentItem());
-		
-	setUpdatesEnabled(true);		
-}
-
-void CKeyChooserWidget::reset(const int count, int index, bool do_emit){
-	if (!isUpdatesEnabled())
-		return;
-
-	m_list.clear();
-	for (int i=1; i <= count; i++)
-		m_list.append( QString::number(i) );
-	reset(&m_list,index,do_emit);
-}
-
-void CKeyChooserWidget::reset(QStringList& list, int index, bool do_emit){
-	if (!isUpdatesEnabled())
-		return;
-	
-	m_list = list;
-	reset(&m_list,index,do_emit);
-	
-	isResetting = false;
-}
-
-
-void CKeyChooserWidget::reset(QStringList *list, int index, bool do_emit){
-	if (isResetting || !isUpdatesEnabled())
-		return;
-	isResetting = true;	
-	
-	oldKey = QString::null;
-
-//  m_comboBox->setUpdatesEnabled(false);
-  //DON'T REMOVE THE HIDE: Otherwise QComboBox's sizeHint() function won't work properly
-  m_comboBox->hide();
-  m_comboBox->clear(); 
-	if (list) {
-		m_comboBox->insertStringList(*list);
-  }
-
-  if (!list || (list && !list->count())) { //nothing in the combobox
-		btn_up->setEnabled( true );
-		btn_fx->setEnabled( true );
-		btn_down->setEnabled( true );	
-		setEnabled(false);
-	}
-	else if (!isEnabled()) { //was disabled
-		setEnabled(true);	
-		const bool enableButtons = list && (list->count()>=1);
-		btn_up->setEnabled( enableButtons );
-		btn_fx->setEnabled( enableButtons );
-		btn_down->setEnabled( list && (list->count()>1) );
-	}
-
-  if (list->count()) {
-  	m_comboBox->setCurrentItem(index);
-  }
-	if (do_emit) {
-		emit changed(m_comboBox->currentItem());				
-	}
-
-  const QSize dummySize = m_comboBox->sizeHint(); //without this function call the combo box won't be properly sized!
-  //DON'T REMOVE OR MOVE THE show()! Otherwise QComboBox's sizeHint() function won't work properly!
-  m_comboBox->show();
-
-//  m_comboBox->setFont( m_comboBox->font() );
-//  m_comboBox->setUpdatesEnabled(true);
-
-	isResetting = false;	
-}
-
-void CKeyChooserWidget::lock(void){
-	comboBox()->setEditable(false);
-	oldKey = comboBox()->currentText();
-}
-
-void CKeyChooserWidget::unlock(void){
-	comboBox()->setEditable(true);
-	comboBox()->setEditText(comboBox()->text(comboBox()->currentItem()));
-	if (comboBox()->currentText() != oldKey);
-		emit changed(comboBox()->currentItem());
-}
-
-/** Initializes this widget. We need this function because we have more than one constructor. */
-void CKeyChooserWidget::init(){
-	oldKey = QString::null;
-	btn_up = btn_down = btn_fx = 0;
-
-	setFocusPolicy(QWidget::WheelFocus);			
-			
-	m_comboBox = new CKCComboBox( true, this );
-	m_comboBox->setAutoCompletion( true );
-	m_comboBox->setInsertionPolicy(QComboBox::NoInsertion);
-	m_comboBox->setFocusPolicy(QWidget::WheelFocus);
-	
-	m_mainLayout = new QHBoxLayout( this );
-	m_mainLayout->addWidget(m_comboBox,5);
-  
-	QVBoxLayout* m_buttonLayout = new QVBoxLayout();	
-	m_buttonLayout->setAlignment(Qt::AlignHCenter | Qt::AlignCenter);
-
-	btn_up = new QToolButton( UpArrow, this, "btn_up" );	
-	btn_up->setFixedSize(WIDTH, ARROW_HEIGHT);
-	btn_up->setFocusPolicy(QWidget::NoFocus);	
-	
-	btn_fx = new cfx_btn( this, "btn_fx" );
-	btn_fx->setFixedSize(WIDTH, MOVER_HEIGHT);
-	btn_fx->setFocusPolicy(QWidget::NoFocus);	
-	
-	btn_down = new QToolButton( DownArrow, this, "btn_down" );	
-	btn_down->setFixedSize(WIDTH, ARROW_HEIGHT);
-	btn_down->setFocusPolicy(QWidget::NoFocus);	
-	
-	m_buttonLayout->addWidget( btn_up,0 );	
-	m_buttonLayout->addWidget( btn_fx,0 );	
-	m_buttonLayout->addWidget( btn_down,0 );
-	
-	m_mainLayout->addLayout( m_buttonLayout );
-	m_mainLayout->addSpacing(2);
-
-	setTabOrder(m_comboBox, 0);
-		
-// signals and slots connections
- 	if ( CBTConfig::get(CBTConfig::scroll) ) {
-		if (m_useNextPrevSignals) {
-			connect(btn_up, SIGNAL(clicked()), SIGNAL(prev_requested()) );	
-			connect(btn_down, SIGNAL(clicked()), SIGNAL(next_requested()) );
-	  }
-	  else {
-			connect(btn_up, SIGNAL(clicked()), SLOT(previous()) );	
-			connect(btn_down, SIGNAL(clicked()), SLOT(next()) );	
-	  }
-	}
-	else {
-		if (m_useNextPrevSignals) {
-			connect(btn_up, SIGNAL(clicked()), SIGNAL(next_requested()) );	
-			connect(btn_down, SIGNAL(clicked()), SIGNAL(prev_requested()) );
-	  }
-	  else {
-			connect(btn_up, SIGNAL(clicked()), SLOT(next()) );	
-			connect(btn_down, SIGNAL(clicked()), SLOT(previous()) );	
-		}
-	}
-	
-	connect(btn_fx, SIGNAL(lock()), SLOT(lock()) );
-	connect(btn_fx, SIGNAL(unlock()), SLOT(unlock()) );
-	connect(btn_fx, SIGNAL(change_requested(int)), SLOT(changeCombo(int)) );
-	
-	connect(m_comboBox, SIGNAL(activated(int)), SLOT(slotComboChanged(int)));
-	connect(m_comboBox, SIGNAL(activated(const QString&)), SLOT(slotReturnPressed(const QString&)));
- 	connect(m_comboBox, SIGNAL(focusOut(int)), SIGNAL(focusOut(int)));	
-		
-	isResetting = false;
-}
-
-/** Is called when the return key was presed in the combobox. */
-void CKeyChooserWidget::slotReturnPressed( const QString& text){
-	for (int index=0; index < comboBox()->count(); index++) {
-		if (comboBox()->text(index) == text) {
-			if (/*!oldKey.isNull() &&*/ text != oldKey)	//if the key has changed
-				emit changed(index);
-			break;
-		}
-	}
-}
-
-/** Is called when the current item of the combo box was changed. */
-void CKeyChooserWidget::slotComboChanged(int index){
-//	qWarning("CKeyChooserWidget::slotComboChanged(int index)");
-	if (!isUpdatesEnabled())
-		return;
-	setUpdatesEnabled(false);	
-	
-	const QString key = comboBox()->text( index );
-	if (oldKey.isNull() || (oldKey != key))
-		emit changed(index);
-	oldKey = key;
-
-	setUpdatesEnabled(true);		
-}
-
-/** Sets the tooltips for the given entries using the parameters as text. */
-void CKeyChooserWidget::setToolTips( const QString comboTip, const QString nextEntryTip, const QString scrollButtonTip, const QString previousEntryTip){
-//  qWarning("add tooltip heklps: %s, %s, %s, %s", comboTip.latin1(), nextEntryTip.latin1(), scrollButtonTip.latin1(), previousEntryTip.latin1());
-
-  QToolTip::add(comboBox(),comboTip);
-	QToolTip::add(btn_fx,  scrollButtonTip);
-
- 	if ( CBTConfig::get(CBTConfig::scroll) ){
-		QToolTip::add(btn_down, nextEntryTip);
-		QToolTip::add(btn_up,	previousEntryTip);
-	}
-	else {
-		QToolTip::add(btn_up,   nextEntryTip);
-		QToolTip::add(btn_down, previousEntryTip);
-	}
-}
-
-/** No descriptions */
-void CKeyChooserWidget::setWhatsThis(const QString comboTip, const QString nextEntryTip, const QString scrollButtonTip, const QString previousEntryTip){
-//  qWarning("add whatsthis heklps: %s, %s, %s, %s", comboTip.latin1(), nextEntryTip.latin1(), scrollButtonTip.latin1(), previousEntryTip.latin1());
-  QWhatsThis::add(comboBox(),comboTip);
-	QWhatsThis::add(btn_fx,  scrollButtonTip);
-
- 	if ( CBTConfig::get(CBTConfig::scroll) ) {
-		QWhatsThis::add(btn_down, nextEntryTip);
-		QWhatsThis::add(btn_up,   previousEntryTip);
-	}
-	else {
-		QWhatsThis::add(btn_up,   nextEntryTip);
-		QWhatsThis::add(btn_down, previousEntryTip);
-	}
-}
-
-/** Sets the current item to the one with the given text */
-bool CKeyChooserWidget::setItem( const QString item ){
-	bool ret = false;
-	const int count = comboBox()->count();
-	for (int i = 0; i < count; ++i) {
-		if (comboBox()->text(i) == item) {
-			comboBox()->setCurrentItem(i);
-			ret = true;
-			break;
-		}
-	}
-	if (!ret)
-		comboBox()->setCurrentItem(-1);
-	return ret;
-}
-
-/** Jump to the next entry. */
-void CKeyChooserWidget::next(){
-	if (comboBox()->currentItem() != comboBox()->count()-1) {// not last entry
-		comboBox()->setCurrentItem( comboBox()->currentItem()+1 );
-		emit changed(comboBox()->currentItem());
-	}
-}
-
-/** Jump to the previous entry. */
-void CKeyChooserWidget::previous(){
-	if (comboBox()->currentItem() != 0) {// not last entry
-		comboBox()->setCurrentItem( comboBox()->currentItem()-1 );
-		emit changed(comboBox()->currentItem());
-	}
-}
-
-QComboBox* CKeyChooserWidget::comboBox(){
-	return m_comboBox;
-}
-
diff --git a/bibletime/frontend/keychooser/ckeychooserwidget.h b/bibletime/frontend/keychooser/ckeychooserwidget.h
deleted file mode 100644
index 2707ced..0000000
--- a/bibletime/frontend/keychooser/ckeychooserwidget.h
+++ /dev/null
@@ -1,230 +0,0 @@
-/***************************************************************************
-                          ckeychooserwidget.h  -  description
-                             -------------------
-    begin                : Tue Sep 19 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CKEYCHOOSERWIDGET_H
-#define CKEYCHOOSERWIDGET_H
-
-#include <qwidget.h>
-#include <qmap.h>
-
-#include <qcombobox.h>
-#include <qstringlist.h>
-
-class cfx_btn;
-class CLexiconKeyChooser;
-//class CMinMaxLayout;
-
-class QIconSet;
-//class QComboBox;
-class QToolButton;
-class QStringList;
-class QPoint;
-class QMouseEvent;
-class QWheelEvent;
-class QHBoxLayout;
-
-/*
-* We use this class to conrtol the focus move in the combobox
-* This class is used in the key chooser widgets
-*/
-class CKCComboBox : public QComboBox {
-  Q_OBJECT
-
-public:
-  CKCComboBox(bool rw, QWidget * parent=0, const char * name=0 );
-  /**
-  * Returns the size this widget would like to have.
-  */
-//  virtual QSize sizeHint() const;
-
-protected:
-  /**
-  * Reimplementation.
-  */
-  virtual bool eventFilter( QObject *o, QEvent *e );
-  /**
-  * Scrolls in the list if the wheel of the mouse was used.
-  */
-  virtual void wheelEvent( QWheelEvent* e);
-
-signals:
-  /**
-  * Emitted when the user moves the focus away from the combo by pressing tab
-  */
-	void focusOut(int itemIndex);
-};
-
-/**
-	* This class implements the KeyCooser Widget, which
-	* consists of a @ref QComboBox, two normal ref @QToolButton
-	* and a enhanced @ref cfx_btn
-	*
-  * @author The BibleTime team
-  */
-class CKeyChooserWidget : public QWidget  {
-   Q_OBJECT
-public:
-	/**
-	* the constructor
-	*/
-	CKeyChooserWidget(QStringList *list=0, const bool useNextPrevSignals = false, QWidget *parent=0, const char *name=0);
-	/**
-	* the constructor
-	*/
-	CKeyChooserWidget(int count=0, const bool useNextPrevSignals = false, QWidget *parent=0, const char *name=0);	
-	/**
-	* This function does clear the combobox, then fill in
-	* the StringList, set the ComboBox' current item to index
-	* and if do_emit is true, it will emit @ref #changed
-	*
-	* @param list the stringlist to be inserted
-	* @param index the index that the combobox is to jump to
-	* @param do_emit should we emit @ref #changed(int)
-	*/	
-	void reset(const int count, int index, bool do_emit);
-	void reset(QStringList& list, int index, bool do_emit);
-	void reset(QStringList *list, int index, bool do_emit);	
- 	/**
- 	* Initializes this widget. We need this function because
- 	* we have more than one constructor.
- 	*/
- 	virtual void init();
-  /**
-  *
-  */
-//  virtual void adjustSize();
-  /**
-  * Sets the QWhatsThis help for the different parts.
-  */
-  void setWhatsThis(const QString comboTip, const QString nextEntry, const QString scrollButton, const QString previousEntry);
-  /**
-  * Sets the tooltips for the given entries using the parameters as text.
-  */
-  void setToolTips( const QString comboTip, const QString nextEntry, const QString scrollButton, const QString previousEntry);
-  /**
-  * Sets the current item to the one with the given text
-  */
-  bool setItem( const QString item);
-  /**
-  * Return the combobox of this key chooser widget.
-  */
-  QComboBox* comboBox();
-
-public slots:
-	/**
-	* is called to lock the combobox
-	*/
-	void lock();
-	/**
-	* is called to unlock the combobox
-	*/
-	void unlock();
-	/**
-	* is called to move the combobox to a certain index
-	* @param index the index to jump to
-	*/
-	void changeCombo(int index);
-
-signals:
-	/**
-	* is emittd to proceed to the next entry, which may
-	*	require changes in other widgets also
-	*/
-	void next_requested(void);
-	/**
-	* see @ref #next_requested
-	*/
-	void prev_requested(void);
-	/**
-	* Is emitted if the widget changed, but
-	* only if it is not locked or being reset
-	*
-	* @param the current ComboBox index
-	*/
-	void changed(int index);
-	/**
-	* Is emitted if the widget was left with a focus out event.
-	* @param index The new index of the ComboBox
-	*/
-	void focusOut(int index);
-
-protected:
-	/**
-	* indicates wheter we are resetting at the moment
-	*/
-	bool isResetting;
-	/**
- 	* Returns the icons set which contains the UP button.
- 	*/
-//	QIconSet getUpIconSet();
-  /**
-  * Returns the icons set which contains the button used to change the current item.
-  */
-//  QIconSet getMoverIconSet();
-  /**
-  *  Returns the icons set which contains the down button.
-  */
-//  QIconSet getDownIconSet();
-	/**
-	*
-	*/
-	QString oldKey;
-  /**
-	*
-	*/
-	QToolButton* btn_up;
-	/**
-	*
-	*/
-	QToolButton* btn_down;
-	/**
-	*
-	*/
-	cfx_btn* btn_fx;
-	
-protected slots: // Protected slots
-  /**
-  * Is called when the return key was presed in the combobox.
-  */
-  void slotReturnPressed( const QString& );
-	/**
-  * Is called when the current item of the combo box was changed.
-  */
-  void slotComboChanged(int);
-
-private:
-	friend class CLexiconKeyChooser;
-	QStringList	m_list;
-	bool m_useNextPrevSignals;
-	/**
-	* Members should never be public!!
-	*/
-	CKCComboBox* m_comboBox;
-	QHBoxLayout *m_mainLayout;
-
-private slots: // Private slots
-  /**
-  * Jump to the previous entry.
-  */
-  void previous();
-  /**
-  * Jump to the next entry.
-  */
-  void next();
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.cpp b/bibletime/frontend/keychooser/clexiconkeychooser.cpp
deleted file mode 100644
index 1baea99..0000000
--- a/bibletime/frontend/keychooser/clexiconkeychooser.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/***************************************************************************
-                          clexiconkeychooser.cpp  -  description
-                             -------------------
-    begin                : Wed Sep 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "clexiconkeychooser.h"
-#include "ckeychooserwidget.h"
-#include "cfx_btn.h"
-
-#include "backend/cswordlexiconmoduleinfo.h"
-#include "frontend/cbtconfig.h"
-
-#include "util/cresmgr.h"
-
-//STL headers
-#include <algorithm>
-#include <iterator>
-#include <map>
-
-//Qt includes
-#include <qcombobox.h>
-#include <qlayout.h>
-#include <qlistbox.h>
-
-//KDE includes
-#include <klocale.h>
-
-CLexiconKeyChooser::CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key, QWidget *parent, const char *name )
-	: CKeyChooser(modules, key, parent, name), m_key(dynamic_cast<CSwordLDKey*>(key)){
-
-  setModules(modules, false);
-	
- //we use a layout because the key chooser should be resized to full size
- 	m_layout = new QHBoxLayout(this,QBoxLayout::LeftToRight);
-  m_layout->setResizeMode(QLayout::FreeResize);
-
-	m_widget = new CKeyChooserWidget(0, false, this);
-	m_widget->comboBox()->setMaximumWidth(450);
-	m_widget->setToolTips(
-    CResMgr::displaywindows::lexiconWindow::entryList::tooltip,
-    CResMgr::displaywindows::lexiconWindow::nextEntry::tooltip,
-    CResMgr::displaywindows::general::scrollButton::tooltip,
-    CResMgr::displaywindows::lexiconWindow::previousEntry::tooltip
-  );
-	m_widget->setWhatsThis(
-    CResMgr::displaywindows::lexiconWindow::entryList::whatsthis,
-    CResMgr::displaywindows::lexiconWindow::nextEntry::whatsthis,
-    CResMgr::displaywindows::general::scrollButton::whatsthis,
-    CResMgr::displaywindows::lexiconWindow::previousEntry::whatsthis
-  );
-
-	m_layout->addWidget(m_widget,0,Qt::AlignLeft);
-	
-	connect(m_widget,SIGNAL(changed(int)),SLOT(activated(int)));
-	connect(m_widget,SIGNAL(focusOut(int)),SLOT(activated(int)));
-
-  setModules(modules, true);
-	adjustFont();
-}
-
-CSwordKey* const CLexiconKeyChooser::key(){
-	return m_key;
-}
-
-void CLexiconKeyChooser::setKey(CSwordKey* key){	
- 	if (!(m_key = dynamic_cast<CSwordLDKey*>(key)))
-		return;		
-
-  QString newKey = m_key->key();
-	const int index =	m_widget->comboBox()->listBox()->index(m_widget->comboBox()->listBox()->findItem( newKey ));
-  m_widget->comboBox()->setCurrentItem(index);	
-
-  emit keyChanged( m_key );
-}
-
-void CLexiconKeyChooser::activated(int index){
-	const QString text = m_widget->comboBox()->text(index);	
-
-  // To prevent from eternal loop, because activated() is emitted again
- 	if (m_key && m_key->key() != text) {
-		m_key->key(text); 	
-	 	setKey(m_key);
-	}
-}
-
-inline const bool my_cmpEntries(const QString& a, const QString& b) {
-  return a < b;
-};
-
-/** Reimplementation. */
-void CLexiconKeyChooser::refreshContent(){
-  if (m_modules.count() == 1) {                                                                              
-    m_widget->reset(m_modules.first()->entries(), 0, true);	
-  }
-  else {
-    typedef std::multimap<unsigned int, QStringList*> EntryMap;
-    EntryMap entryMap;
-    QStringList* entries = 0;
-    for (m_modules.first(); m_modules.current(); m_modules.next()) {
-      entries = m_modules.current()->entries();
-      entryMap.insert( std::make_pair(entries->count(), entries) );
-    }
-
-    QStringList goodEntries; //The string list which contains the entries which are available in all modules
-    
-    EntryMap::iterator it = entryMap.begin(); //iterator to go thoigh all selected modules    
-    QStringList refEntries = *(it->second); //copy the items for the first time
-    QStringList* cmpEntries = ( ++it )->second; //list for comparision, starts with the second module in the map   
-
-    while(it != entryMap.end()) {
-      std::set_intersection(
-        refEntries.begin(), --(refEntries.end()), //--end() is the last valid entry
-        cmpEntries->begin(), --(cmpEntries->end()),
-        std::back_inserter(goodEntries), //append valid entries to the end of goodEntries
-        my_cmpEntries  //ci_cmpEntries is the comparision function
-      );
-
-      cmpEntries = ( ++it )->second; //this is a pointer to the string list of a new module
-      
-      /*
-      * use the good entries for next comparision,
-      * because the final list can only have the entries of goodEntries as maxiumum
-      */
-      refEntries = goodEntries;
-    };
-    
-    m_widget->reset(goodEntries, 0, true); //write down the entries
-  } //end of ELSE
-}
-
-/** No descriptions */
-void CLexiconKeyChooser::adjustFont(){
-	//Make sure the entries are displayed correctly.
-		m_widget->comboBox()->setFont( CBTConfig::get( m_modules.first()->language() ).second );
-}
-
-/** Sets the module and refreshes the combo boxes */
-void CLexiconKeyChooser::setModules( ListCSwordModuleInfo modules, const bool refresh ) {
-  m_modules.clear();
-  for (modules.first(); modules.current(); modules.next()) {
-    if (CSwordLexiconModuleInfo* lexicon = dynamic_cast<CSwordLexiconModuleInfo*>(modules.current())) {
-      m_modules.append(lexicon);
-    }
-  }
-  if (refresh){
-    refreshContent();
-		adjustFont();
-	}
-}
-
-/** No descriptions */
-void CLexiconKeyChooser::updateKey(CSwordKey*){
-}
diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.h b/bibletime/frontend/keychooser/clexiconkeychooser.h
deleted file mode 100644
index fc6aaa9..0000000
--- a/bibletime/frontend/keychooser/clexiconkeychooser.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/***************************************************************************
-                          clexiconkeychooser.h  -  description
-                             -------------------
-    begin                : Wed Sep 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CLEXICONKEYCHOOSER_H
-#define CLEXICONKEYCHOOSER_H
-
-#include <qwidget.h>
-#include "ckeychooser.h"
-#include "backend/cswordldkey.h"
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordlexiconmoduleinfo.h"
-
-class CKeyChooserWidget;
-class QHBoxLayout;
-
-/**
-	* This class implements the KeyChooser for lexicons
-	*
-	* it inhertits @ref CKeyChooser
-	*	it uses 1 @ref CKeyChooserWidget to represent the lexicon keys
-	*
-  * @author The BibleTime team
-  */
-class CLexiconKeyChooser : public CKeyChooser  {
-   Q_OBJECT
-public:
-	/**
-	* The constructor
-	*
-	*	you should not need to use this, use @ref CKeyChooser::createInstance instead
-	*/
-	CLexiconKeyChooser(ListCSwordModuleInfo modules, CSwordKey *key=0, QWidget *parent=0, const char *name=0);
-
-public slots:
-	/**
-	* see @ref CKeyChooser::getKey
-	* @return Return the key object we use.
-	*/
-	virtual CSwordKey* const key();
-	/**
-	* see @ref CKeyChooser::setKey
-	*/
-	virtual void setKey(CSwordKey* key);
-	/**
-	* used to react to changes in the @ref CKeyChooserWidget
-	*
-	* @param index not used
-	**/
-	virtual void activated(int index);	
-  /**
-  * Reimplementatuion.
-  */
-  virtual void refreshContent();
-  /**
-  * Sets the module and refreshes the combo boxes of this keychooser.
-  */
-  virtual void setModules( ListCSwordModuleInfo modules, const bool refresh = true );
-
-protected:	
-	class CLexiconPresenter;	
-	friend class CLexiconPresenter;	
-	CKeyChooserWidget *m_widget;
-	CSwordLDKey* m_key;
-	QPtrList<CSwordLexiconModuleInfo> m_modules;
-	QHBoxLayout *m_layout;
-
-  virtual void adjustFont();
-
-public slots: // Public slots
-  virtual void updateKey(CSwordKey* key);
-};
-
-#endif
diff --git a/bibletime/frontend/keychooser/crefselectdialog.cpp b/bibletime/frontend/keychooser/crefselectdialog.cpp
deleted file mode 100644
index 62e3eb7..0000000
--- a/bibletime/frontend/keychooser/crefselectdialog.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/*************************************************************************** 
-    crefselectdialog.cpp  -  description
-                             -------------------
-    begin                : Wed Sep 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "crefselectdialog.h"
-
-// QT
-#include "qlayout.h"
-#include "qlineedit.h"
-#include "qlabel.h"
-
-// backend
-#include "backend/cswordkey.h"
-#include "backend/cswordversekey.h"
-
-//KDE includes
-#include <klocale.h>
-
-
-//CRefSelectDialog::CRefSelectDialog(QWidget *parent)
-//  : KDialogBase(parent, "Refenences",
-//		true, i18n("Refenence selector"),
-//		KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true),
-//  m_oldPos(0,0)
-//
-//{
-//   m_page = new QWidget( this );
-//   m_placeholder = new QWidget( m_page);
-//   QVBoxLayout* layout = new QVBoxLayout( m_page, 0, spacingHint());
-//   m_lineedit = new QLineEdit( QString::null, m_page, "select" );
-//   m_lineedit->setMinimumWidth(fontMetrics().maxWidth()*8);
-//
-//   QHBoxLayout* hlayout = new QHBoxLayout(m_page, 0, spacingHint());
-//   hlayout->addWidget(new QLabel(i18n("Verse key:"), m_page));
-//   hlayout->addWidget(m_lineedit);
-//   layout->addItem(hlayout);
-//   layout->addWidget(m_placeholder);
-//
-//   m_chooser = NULL;
-//   m_oldParent = NULL;
-//   setMainWidget(m_page);
-//
-//   connect(this, SIGNAL(okClicked()), SLOT(slotPressedOk()));
-//   connect(this, SIGNAL(cancelClicked()), SLOT(slotPressedCancel()));
-//}
-//
-//CRefSelectDialog::~CRefSelectDialog() {
-//}
-//
-//
-//void CRefSelectDialog::setChooser(CKeyChooser* const chooser) {
-//  if (chooser && chooser != m_chooser) {
-//    if (m_chooser) restoreParent();
-//
-//    m_chooser = chooser;
-//
-//    // store old owner and position
-//    m_oldParent = chooser->parentWidget(false);
-//    m_oldPos = chooser->pos();
-//
-//    // we temporary borrow chooser widget from the MDI window
-//    m_placeholder->setMinimumSize(chooser->size());
-//    chooser->reparent(m_placeholder, QPoint(0,0), true);
-//  }
-//}
-//
-//void CRefSelectDialog::slotPressedOk() {
-//  // go to proper key
-//  CSwordKey* key = m_chooser->key();
-//  key->key(m_lineedit->text());
-//  m_chooser->setKey(key);
-//
-//  // restore parent of stolen widget
-//  restoreParent();
-//}
-//
-//void CRefSelectDialog::slotPressedCancel() {
-//  // restore parent of stolen widget
-//  restoreParent();
-//}
-//
-//void CRefSelectDialog::restoreParent() {
-//  if (m_chooser && m_oldParent) {
-//    m_chooser->reparent(m_oldParent, m_oldPos, true);
-//  }
-//  m_chooser = NULL;
-//}
-
-
-
-
-
-
diff --git a/bibletime/frontend/keychooser/crefselectdialog.h b/bibletime/frontend/keychooser/crefselectdialog.h
deleted file mode 100644
index cd93ea6..0000000
--- a/bibletime/frontend/keychooser/crefselectdialog.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************** 
-    crefselectdialog.h  -  description
-                             -------------------
-    begin                : Wed Sep 11 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CREFSELECTDIALOG_H
-#define CREFSELECTDIALOG_H
-//Qt includes
-#include <qwidget.h>
-#include <qstring.h>
-class QLineEdit;
-
-//KDE includes
-#include <kdialog.h>
-#include <kdialogbase.h>
-
-
-// BT includes
-#include "ckeychooser.h"
-
-//class CRefSelectDialog : public KDialogBase  {
-//  Q_OBJECT
-// public:
-//  CRefSelectDialog(QWidget *parent);
-//  virtual ~CRefSelectDialog();
-//
-//  void setChooser(CKeyChooser* const chooser);
-//
-// public slots:
-//   void slotPressedOk();
-//   void slotPressedCancel();
-//
-//
-// protected:
-//   void restoreParent();
-//
-// private:
-//  QWidget*     m_page;
-//  QWidget*     m_placeholder;
-//  QWidget*     m_oldParent;
-//  CKeyChooser* m_chooser;
-//  QLineEdit*   m_lineedit;
-//  QPoint       m_oldPos;
-//};
-#endif
-
-
-
-
-
diff --git a/bibletime/frontend/kstartuplogo.cpp b/bibletime/frontend/kstartuplogo.cpp
deleted file mode 100644
index df3c076..0000000
--- a/bibletime/frontend/kstartuplogo.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/***************************************************************************
-                          kstartuplogo.cpp  -  description
-                             -------------------
-    begin                : Sat Sep 11 1999
-    copyright            : (C) 1999 by Torsten Uhlmann
-    email                : TUhlmann@gmx.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//Own includes
-#include "kstartuplogo.h"
-
-//Qt includes
-#include <qapplication.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qpixmap.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <kstandarddirs.h>
-//#include <kimageio.h>
-
-//static objects
-static KStartupLogo* startupLogo = 0;
-
-void KStartupLogo::createSplash() {
-	deleteSplash();
-	startupLogo = new KStartupLogo();
-}
-
-void KStartupLogo::showSplash() {
-	if (startupLogo) {
-		startupLogo->show();
-  }
-}
-
-void KStartupLogo::hideSplash() {
-	if (startupLogo) {
-		startupLogo->hide();
-  }
-}
-
-void KStartupLogo::deleteSplash() {
-	delete startupLogo;
-	startupLogo = 0;
-}
-
-	
-void KStartupLogo::setStatusMessage(const QString& message) {
-	if (startupLogo) {
-		startupLogo->setText(message);
-  }
-}
-
-KStartupLogo::KStartupLogo()
-	: QWidget(0, "startuplogo", /*WStyle_Customize | WStyle_NoBorder*/ WStyle_NoBorder|WStyle_StaysOnTop|WX11BypassWM ) {
-
-  QPixmap pm;	
-	if ( !pm.load(locate("BT_pic","startuplogo.png")) ) {
-  	qWarning("Can't load startuplogo! Check your installation.");
-  }
-
-  setBackgroundPixmap(pm);
-
-  //Please not change the margin
-  textLabel = new QLabel(this);
-  textLabel->setGeometry(0,pm.height(),pm.width(),textLabel->sizeHint().height()+10);
-  textLabel->setBackgroundColor( QColor("#0d6de9") );
-  textLabel->setFrameStyle(QFrame::Panel | QFrame::Plain);
-  textLabel->setLineWidth(1);
-  textLabel->setScaledContents( true );
-
-  QFont f;
-  f.setBold( true );
-  textLabel->setFont( f );
-
-	QPalette p = palette();
-  p.setColor( QPalette::Inactive, QColorGroup::Text, Qt::white );
-  p.setColor( QPalette::Inactive, QColorGroup::Foreground, Qt::white );
-  p.setColor( QPalette::Normal, QColorGroup::Text, Qt::white );
-  p.setColor( QPalette::Normal, QColorGroup::Foreground, Qt::white );
-  setPalette( p );
-
-  setGeometry (
-    (KApplication::desktop()->width()-pm.width())/2,
-		(KApplication::desktop()->height()-pm.height()-textLabel->height())/2,
-    pm.width(),
-    pm.height()+textLabel->height()
-  );
-}
-
-void KStartupLogo::setText(const QString text){
-	//Please not make the text bold & let the first character be blank
-  textLabel->setText( QString::fromLatin1(" %1").arg(text) );
-  KApplication::kApplication()->processEvents();
-}
-
-/** Makes the splashscreen the toplevel window. */
-void KStartupLogo::raiseSplash(){
-	if (startupLogo) {
-    startupLogo->raise();
-    startupLogo->setActiveWindow();
-    startupLogo->textLabel->show();
-  }
-}
-
-/** Lowers the splash screen one window down, so it's possible to make it not to hide tip windows or other startup stuff. */
-void KStartupLogo::lowerSplash(){
-	if (startupLogo) {
-    startupLogo->lower();
-  }
-}
diff --git a/bibletime/frontend/kstartuplogo.h b/bibletime/frontend/kstartuplogo.h
deleted file mode 100644
index 5123bf3..0000000
--- a/bibletime/frontend/kstartuplogo.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/***************************************************************************
-                          kstartuplogo.h  -  description                              
-                             -------------------                                         
-    begin                : Sat Sep 11 1999                                           
-    copyright            : (C) 1999 by Torsten Uhlmann
-    email                : TUhlmann@gmx.de                                     
- ***************************************************************************
- ***************************************************************************
- *                                                                         *
- *   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.                                   * 
- *                                                                         *
- ***************************************************************************/
-
-
-#ifndef KSTARTUPLOGO_H
-#define KSTARTUPLOGO_H
-
-#include <qwidget.h>
-
-//forward declarations
-class QLabel;
-
-
-/**
-	* This class provides a startuplogo.
-  * @author The team of BibleTime
-  */
-class KStartupLogo : public QWidget {
-public:
-	static void createSplash();
-	static void showSplash();
-	static void hideSplash();
-	static void deleteSplash();		
-	static void setStatusMessage(const QString& message);
-  /** Makes the splashscreen the toplevel window. */
-  static void raiseSplash();
-  /** Lowers the splash screen one window down, so it's possible to make it not to hide tip windows or other startup stuff. */
-  static void lowerSplash();
-
-private:
-	KStartupLogo();
-  void setText(const QString text);
-  QLabel* textLabel;
-};
-
-#endif
-
-
-
-
-
-
diff --git a/bibletime/frontend/mainindex/Makefile.am b/bibletime/frontend/mainindex/Makefile.am
deleted file mode 100644
index e79b5b8..0000000
--- a/bibletime/frontend/mainindex/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-INCLUDES = $(all_includes)
-libmainindex_a_METASOURCES = AUTO
-noinst_LIBRARIES = libmainindex.a
-
-libmainindex_a_SOURCES = \
-cmainindex.cpp \
-cindexitem.cpp
-
-all_headers = \
-cmainindex.h \
-cindexitem.h
-
-EXTRA_DIST = $(libmainindex_a_SOURCES) $(all_headers)
-
-
-
-
-
diff --git a/bibletime/frontend/mainindex/Makefile.in b/bibletime/frontend/mainindex/Makefile.in
deleted file mode 100644
index 1ae5e2d..0000000
--- a/bibletime/frontend/mainindex/Makefile.in
+++ /dev/null
@@ -1,685 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-#>- libmainindex_a_METASOURCES = AUTO
-noinst_LIBRARIES = libmainindex.a
-
-libmainindex_a_SOURCES = \
-cmainindex.cpp \
-cindexitem.cpp
-
-
-all_headers = \
-cmainindex.h \
-cindexitem.h
-
-
-EXTRA_DIST = $(libmainindex_a_SOURCES) $(all_headers)
-subdir = bibletime/frontend/mainindex
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libmainindex_a_AR = $(AR) cru
-libmainindex_a_LIBADD =
-am_libmainindex_a_OBJECTS = cmainindex.$(OBJEXT) cindexitem.$(OBJEXT)
-#>- libmainindex_a_OBJECTS = $(am_libmainindex_a_OBJECTS)
-#>+ 5
-libmainindex_a_final_OBJECTS = libmainindex_a.all_cpp.o 
-libmainindex_a_nofinal_OBJECTS = cmainindex.$(OBJEXT) cindexitem.$(OBJEXT)\
-cmainindex.moc.o 
-@KDE_USE_FINAL_FALSE@libmainindex_a_OBJECTS = $(libmainindex_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libmainindex_a_OBJECTS = $(libmainindex_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cindexitem.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cmainindex.Po
-#>+ 4
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/cmainindex.moc.P  $(DEPDIR)/libmainindex_a.all_cpp.P ./$(DEPDIR)/cindexitem.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cmainindex.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/cmainindex.moc.P ./$(DEPDIR)/cindexitem.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cmainindex.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libmainindex_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libmainindex_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/frontend/mainindex/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/mainindex/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/mainindex/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libmainindex.a: $(libmainindex_a_OBJECTS) $(libmainindex_a_DEPENDENCIES) 
-	-rm -f libmainindex.a
-	$(libmainindex_a_AR) libmainindex.a $(libmainindex_a_OBJECTS) $(libmainindex_a_LIBADD)
-	$(RANLIB) libmainindex.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cindexitem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cmainindex.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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:  $(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 "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-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
-
-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-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-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.
-.NOEXPORT:
-
-#>+ 3
-cmainindex.moc.cpp: $(srcdir)/cmainindex.h
-	$(MOC) $(srcdir)/cmainindex.h -o cmainindex.moc.cpp
-
-#>+ 2
-mocs: cmainindex.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  cmainindex.moc.cpp
-
-#>+ 2
-KDE_DIST=cindexitem.h cmainindex.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/mainindex/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/mainindex/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libmainindex_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cmainindex.cpp $(srcdir)/cindexitem.cpp cmainindex.moc.cpp 
-	@echo 'creating libmainindex_a.all_cpp.cpp ...'; \
-	rm -f libmainindex_a.all_cpp.files libmainindex_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libmainindex_a.all_cpp.final; \
-	for file in cmainindex.cpp cindexitem.cpp cmainindex.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libmainindex_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libmainindex_a.all_cpp.final; \
-	done; \
-	cat libmainindex_a.all_cpp.final libmainindex_a.all_cpp.files > libmainindex_a.all_cpp.cpp; \
-	rm -f libmainindex_a.all_cpp.final libmainindex_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libmainindex_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libmainindex_a_OBJECTS="$(libmainindex_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libmainindex_a_OBJECTS="$(libmainindex_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libmainindex_a_OBJECTS="$(libmainindex_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libmainindex_a_OBJECTS="$(libmainindex_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/frontend/mainindex/cindexitem.cpp b/bibletime/frontend/mainindex/cindexitem.cpp
deleted file mode 100644
index 4977400..0000000
--- a/bibletime/frontend/mainindex/cindexitem.cpp
+++ /dev/null
@@ -1,1253 +0,0 @@
-/***************************************************************************
-                          cindexitem.cpp  -  description
-                             -------------------
-    begin                : Sam Jun 22 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cindexitem.h"
-#include "cmainindex.h"
-
-#include "backend/creferencemanager.h"
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordversekey.h"
-#include "backend/clanguagemgr.h"
-
-#include "frontend/searchdialog/csearchdialog.h"
-#include "frontend/cexportmanager.h"
-#include "frontend/ctooltipmanager.h"
-#include "frontend/cbtconfig.h"
-#include "frontend/cinputdialog.h"
-#include "frontend/cexportmanager.h"
-#include "frontend/cdragdropmgr.h"
-
-#include "util/cresmgr.h"
-#include "util/ctoolclass.h"
-
-#include <string.h>
-
-//Qt includes
-#include <qdragobject.h>
-#include <qstringlist.h>
-#include <qfile.h>
-#include <qstring.h>
-#include <qtextstream.h>
-
-//KDE includes
-#include <kconfig.h>
-#include <klocale.h>
-#include <kfiledialog.h>
-#include <kiconloader.h>
-#include <kstandarddirs.h>
-
-#define CURRENT_SYNTAX_VERSION 1
-
-using std::string;
-
-CItemBase::CItemBase(CMainIndex* mainIndex, const Type type)
-  : KListViewItem(mainIndex),
-    m_type(type),
-    m_sortingEnabled(true)
-{
-  
-}
-
-CItemBase::CItemBase(CItemBase* parentItem, const Type type)
-  : KListViewItem(parentItem),
-    m_type(type),
-    m_sortingEnabled(true)
-{
-
-}
-
-CItemBase::~CItemBase() {
-}
-
-const QString CItemBase::toolTip() {
-  return QString::null;
-}
-
-/** Returns the used main index. */
-CMainIndex* CItemBase::listView() const{
-  return dynamic_cast<CMainIndex*>( QListViewItem::listView() );
-}
-
-void CItemBase::init() {
-  update();
-}
-
-void CItemBase::update() {
-}
-
-const CItemBase::Type& CItemBase::type() const{
-  return m_type;
-};
-
-void CItemBase::moveAfter( CItemBase* const item ){
-	if (!item)
-		return;
-	
-	if ( parent() != item->parent() ) { //different levels
-//		if (type == AllowDifferentParents) { //different parents are allowed
-//			if (item->parent())
-//				item->parent()->insertItem(this); //insert item to the childs
-//			else
-//				listView()->insertItem(this);
-//			moveItem(item);
-//		}
-	}
-	else {
-		moveItem(item); //both items are on the same level, so we can use moveItem
-	}
-}
-
-void CItemBase::dropped( QDropEvent* /*e*/ ) {
-}
-
-
-/** Returns true if the given action should be enabled in the popup menu. */
-const bool CItemBase::enableAction( const MenuAction /*action*/ ){
-  return false; //this base class has no valif actions
-}
-
-/** No descriptions */
-const bool CItemBase::isMovable(){
-  return false;
-}
-
-const bool CItemBase::allowAutoOpen( const QMimeSource* ) const {
-  return false;
-};
-
-/** This function engables or disables sorting depending on the parameter. */
-void CItemBase::setSortingEnabled( const bool& enableSort ){
-  m_sortingEnabled = enableSort;
-}
-
-/** Returns true whether the sorting is enabled or not. */
-const bool CItemBase::isSortingEnabled(){
-  return m_sortingEnabled;
-}
-
-/** Reimplementation which takes care of the our sortingEnabled setting. */
-void CItemBase::sortChildItems( int col, bool asc ){
-  if (!isSortingEnabled()) {
-    return;
-  }
-  else {
-    KListViewItem::sortChildItems( col, asc );
-  }
-}
-
-/** Reimplementation which takes care of the our sortingEnabled setting. */
-void CItemBase::sort(){
-  if (!isSortingEnabled()) {
-    return;
-  }
-  else {
-    KListViewItem::sort();
-  }
-}
-
-/* ---------------------------------------------- */
-/* ---------- new class: CModuleItem ------------ */
-/* ---------------------------------------------- */
-
-CModuleItem::CModuleItem(CTreeFolder* parentItem, CSwordModuleInfo* module) : CItemBase(parentItem), m_module(module) {
-}
-
-CModuleItem::~CModuleItem() {
-}
-
-/** No descriptions */
-void CModuleItem::update(){
-  if (m_module) {
-    setPixmap(0, CToolClass::getIconForModule(m_module));
-    setText(0,m_module->name() );
-  }
-}
-
-void CModuleItem::init(){
-  setDragEnabled(false);
-  setDropEnabled(true);
-
-  update();
-}
-
-
-/** Reimplementation to handle text drops on a module. In this case open the searchdialog. In the case of a referebnce open the module at the given position. */
-bool CModuleItem::acceptDrop( const QMimeSource* src ) const {
-  if (CDragDropMgr::canDecode(src)) {
-    if (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark) {
-      CDragDropMgr::Item item = CDragDropMgr::decode(src).first();
-      CSwordModuleInfo* m = backend()->findModuleByName( item.bookmarkModule() );
-      if (m && module()->type() == m->type()) { //it makes only sense
-        return true;
-      }
-      //but we also allow drops from bibles on commentaries and the other way from commentaries
-      else if (m && (module()->type() == CSwordModuleInfo::Bible) && (m->type() == CSwordModuleInfo::Commentary)) {
-        return true;
-      }
-      else if (m && (module()->type() == CSwordModuleInfo::Commentary) && (m->type() == CSwordModuleInfo::Bible)) {
-        return true;
-      }
-    }
-    else if(CDragDropMgr::dndType(src) == CDragDropMgr::Item::Text) { //text drop on a module
-      return true;
-    };
-  }
-  return false; //default return value
-}
-
-/** No descriptions */
-void CModuleItem::dropped( QDropEvent* e ){
-  /* Something was dropped on a module item
-  *
-  * 1. If the drop type is plain text open the searchdialog for this text and start the search
-  * 2. If the type is Bookmark, open the module at the specified position
-  *
-  * We support only the first drop item, more is not useful
-  */
-
-  if (acceptDrop(e)) {
-    CDragDropMgr::ItemList dndItems = CDragDropMgr::decode(e);
-    CDragDropMgr::Item item = dndItems.first();
-    if (CDragDropMgr::dndType(e) == CDragDropMgr::Item::Text) { //open the searchdialog
-//      qWarning("Text dropped!");
-  		if ( module() ) {
-        ListCSwordModuleInfo modules;
-        modules.append(module());
-
-        CSearchDialog::openDialog(modules, item.text());
-      }
-    }
-    else if (CDragDropMgr::dndType(e) == CDragDropMgr::Item::Bookmark) { //open the module
-//      qWarning("type is Bookmark!");    
-      CSwordModuleInfo* m = backend()->findModuleByName( item.bookmarkModule() );
-      if (m) { //it makes only sense to create a new window for a module with the same type
-        if ((module()->type() == m->type()) ||
-            ((module()->type() == CSwordModuleInfo::Bible || module()->type() == CSwordModuleInfo::Commentary)
-            && (m->type() == CSwordModuleInfo::Bible || m->type() == CSwordModuleInfo::Commentary)))
-        { //same base type of module
-          ListCSwordModuleInfo modules;
-          modules.append(module());
-
-          listView()->emitModulesChosen(modules, item.bookmarkKey());
-        };
-      }
-    }
-//    else {
-////      qWarning("type is Unknown!");
-//    };
-  };
-}
-
-
-/** Reimplementation. */
-const QString CModuleItem::toolTip(){
-    QString text;
-		text = QString::fromLatin1("<DIV STYLE=\"border-bottom:thin solid black;\">")
-      + i18n("Module")
-      + QString::fromLatin1(": <B>%1</B></DIV>").arg( module()->name() )
-      + ((module()->category() == CSwordModuleInfo::Cult) ? QString::fromLatin1("<B>%1</B><BR>").arg(i18n("Take care, this module contains cult / questionable material!")) : QString::null);
-		text += QString::fromLatin1("<DIV STYLE=\"border-bottom:thin solid black;\">") + module()->config(CSwordModuleInfo::Description) + QString::fromLatin1("</DIV>");
-		text += i18n("Language")+ QString::fromLatin1(": %1<BR>").arg(module()->language().translatedName());
-		if (module()->isEncrypted())
-			text += i18n("Unlock key") + QString::fromLatin1(": %1<BR>")
-				.arg(!module()->config(CSwordModuleInfo::CipherKey).isEmpty() ? module()->config(CSwordModuleInfo::CipherKey) : QString("<FONT COLOR=\"red\">%1</FONT>").arg(i18n("not set")));
-		if (module()->hasVersion())
-			text += i18n("Version") + QString::fromLatin1(": %1<BR>").arg(module()->config(CSwordModuleInfo::ModuleVersion));
-     	     	
-   	QString options;
-   	unsigned int opts;
-   	for (opts = CSwordBackend::filterTypesMIN; opts <= CSwordBackend::filterTypesMAX; ++opts){
-   		if (module()->has( static_cast<CSwordBackend::FilterTypes>(opts) )) {
-     		if (!options.isEmpty())
-     			options += QString::fromLatin1(", ");
-     		options += CSwordBackend::translatedOptionName( static_cast<CSwordBackend::FilterTypes>(opts) );
-   		}
-   	}
-   	if (!options.isEmpty())
-   		text += i18n("Options") + QString::fromLatin1(": <font size= \"-1\">") + options + QString::fromLatin1("</font>");
-     		
-		if (text.right(4) == QString::fromLatin1("<BR>"))
-			text = text.left(text.length()-4);
-		return text;
-}
-
-/** Returns the used module. */
-CSwordModuleInfo* const CModuleItem::module() const {
-  return m_module;
-}
-
-/** Returns the about module info of the used module. */
-const QString CModuleItem::aboutInfo(){
-	QString text;	
-
-  if (module()->hasVersion())
-    text += QString::fromLatin1("<b>%1:</b> %2<br>")
-    	.arg(i18n("Version"))
-    	.arg(module()->config(CSwordModuleInfo::ModuleVersion));
-
-	text += QString::fromLatin1("<b>%1:</b> %2<br><b>%3:</b> %4<br>")
-		.arg(i18n("Location"))
-		.arg(module()->config(CSwordModuleInfo::AbsoluteDataPath))
-		.arg(i18n("Language"))
-		.arg(module()->language().translatedName());
-
-	if (module()->isWritable())
-		text += QString::fromLatin1("<b>%1:</b> %2<br>")
-							.arg(i18n("Writable"))
-							.arg(i18n("yes"));
-
-	if ( module()->isEncrypted() )
-		text += QString::fromLatin1("<b>%1:</b> %2<br>")
-							.arg(i18n("Unlock key"))
-							.arg(module()->config(CSwordModuleInfo::CipherKey));	
-
-	QString options;
-	unsigned int opts;
-	for (opts = CSwordBackend::filterTypesMIN; opts <= CSwordBackend::filterTypesMAX; ++opts){
-		if (module()->has( static_cast<CSwordBackend::FilterTypes>(opts) )){
-  		if (!options.isEmpty())
-  			options += QString::fromLatin1(", ");
-  		options += CSwordBackend::translatedOptionName( static_cast<CSwordBackend::FilterTypes>(opts) );
-		}
-	}
-	if (!options.isEmpty())
-		text += QString("<b>%1:</b> %2<br>")
-			.arg(i18n("Features"))
-			.arg(options);
-
-  if (m_module->category() == CSwordModuleInfo::Cult) { //clearly say the module contains cult/questionable materials
-    text += QString::fromLatin1("<BR><B>%1</B><BR><BR>")
-              .arg(i18n("Take care, this module contains cult / questionable material!"));
-  };
-
-	text += QString::fromLatin1("<b>%1:</b><br> <font size=\"-1\">%2</font>")
-						.arg(i18n("About"))
-						.arg(module()->config(CSwordModuleInfo::AboutInformation));
-  return text;
-}
-
-
-/** Reimplementation from  CItemBase. */
-const bool CModuleItem::enableAction( const MenuAction action ){
-  if (action == EditModule) {
-    if (!module())
-      return false;
-    return module()->isWritable();
-  }
-
-  if (action == SearchInModules || action == AboutModule)
-    return true;
-  if (module()->isEncrypted() && action == UnlockModule)
-    return true;
-  return false;
-}
-
-/* ----------------------------------------------*/
-/* ---------- new class: CBookmarkItem ------------*/
-/* ----------------------------------------------*/
-
-CBookmarkItem::CBookmarkItem(CFolderBase* parentItem, CSwordModuleInfo* module, const QString& key, const QString& description)
-  : CItemBase(parentItem),
-    m_description(description),
-    m_moduleName(module ? module->name() : QString::null)
-{
-  if ((module && (module->type() == CSwordModuleInfo::Bible) || (module->type() == CSwordModuleInfo::Commentary))  ) {
-    CSwordVerseKey vk(0);
-    vk = key;
-    vk.setLocale("en");
-    m_key = vk.key(); //the m_key member is always the english key!
-  }
-  else {
-    m_key = key;
-  };
-
-  m_startupXML = QDomElement(); //empty XML code
-}
-
-CBookmarkItem::CBookmarkItem(CFolderBase* parentItem, QDomElement& xml )
-  : CItemBase(parentItem),
-    m_key(QString::null),
-    m_description(QString::null),
-    m_moduleName(QString::null)
-{
-  m_startupXML = xml;
-}
-
-CBookmarkItem::~CBookmarkItem() {
-
-}
-
-/** No descriptions */
-void CBookmarkItem::update(){
-  const QString title = QString::fromLatin1("%1 (%2)").arg(key()).arg(module() ? module()->name() : i18n("unknown"));
-  setText(0, title);
-  setPixmap(0,SmallIcon(CResMgr::mainIndex::bookmark::icon,16));
-}
-
-void CBookmarkItem::init(){
-  if (!m_startupXML.isNull()) { //we have some XML code to parse
-    loadFromXML(m_startupXML);
-  }
-
-  update();
-  setDropEnabled(false);
-  setDragEnabled(false);
-
-//  if (!module())
-//    setSelectable(false);
-}
-
-/** Reimplementation. */
-const QString CBookmarkItem::toolTip(){
-  if (!module()) {
-    return QString::null;
-  }
-
-  return CTooltipManager::textForReference(module()->name(), key(), description());
-}
-
-/** Returns the used module. */
-CSwordModuleInfo* const CBookmarkItem::module() {
-  CSwordModuleInfo* m = backend()->findModuleByName(m_moduleName);
-//  Q_ASSERT(m);
-  return m;
-}
-
-/** Returns the used key. */
-const QString CBookmarkItem::key(){
-  const QString englishKeyName = englishKey();
-  if (!module()) {
-    return englishKeyName;
-  }
-
-  QString returnKeyName = englishKeyName;
-  if ((module()->type() == CSwordModuleInfo::Bible) || (module()->type() == CSwordModuleInfo::Commentary)) {
-    CSwordVerseKey vk(0);
-    vk = englishKeyName;
-    vk.setLocale( backend()->booknameLanguage().latin1() );
-
-    returnKeyName = vk.key(); //the returned key is always in the currently set bookname language
-  }
-
-  return returnKeyName;
-}
-
-/** Returns the used description. */
-const QString& CBookmarkItem::description(){
-  return m_description;
-}
-
-/** No descriptions */
-const bool CBookmarkItem::isMovable(){
-  return true;
-}
-
-/** Reimplementation to handle  the menu entries of the main index. */
-const bool CBookmarkItem::enableAction(const MenuAction action){
-  if (action == ChangeBookmark || (module() && (action == PrintBookmarks)) || action == DeleteEntries)
-    return true;
-
-  return false;
-}
-
-void CBookmarkItem::print(){
-  if (!module())
-    return;
-
-  CExportManager mgr(i18n("Print bookmark"),false);
-  mgr.printKey(module(), key(), key(), description());
-}
-
-/** Changes this bookmark. */
-void CBookmarkItem::rename(){
-  bool ok  = false;
-  QString newDescription = CInputDialog::getText(i18n("Change description ..."),i18n("Enter a new description for the chosen bookmark."), description(), &ok, listView(), true);
-  if (ok) {
-    m_description = newDescription;
-    update();
-  }
-}
-
-/** Reimplementation of CItemBase::saveToXML. */
-QDomElement CBookmarkItem::saveToXML( QDomDocument& doc ){
-  QDomElement elem = doc.createElement("Bookmark");
-
-  elem.setAttribute("key", englishKey());
-  elem.setAttribute("description", description());
-  elem.setAttribute("modulename", m_moduleName);
-  elem.setAttribute("moduledescription", module() ? module()->config(CSwordModuleInfo::Description) : QString::null);
-
-  return elem;
-}
-
-void CBookmarkItem::loadFromXML( QDomElement& element ) {
-  if (element.isNull())
-    return;
-
-  //find the right module
-  if (element.hasAttribute("modulename")) {
-		//we use the name in all cases, even if the module isn't installed anymore
-		m_moduleName = element.attribute("modulename");
-  }
-
-  if (element.hasAttribute("key")) {
-    m_key = element.attribute("key");
-  }
-
-  if (element.hasAttribute("description")) {
-    m_description = element.attribute("description");
-  }
-}
-
-/** Returns the english key. */
-const QString& CBookmarkItem::englishKey(){
-  return m_key;
-}
-
-/** Reimplementation. Returns false everytime because a bookmarks  has not possible drops. */
-bool CBookmarkItem::acceptDrop(const QMimeSource* /*src*/){
-  return false;
-}
-
-/****************************************/
-/*****  class: CItemFolder  *************/
-/****************************************/
-
-CFolderBase::CFolderBase(CMainIndex* mainIndex, const Type type) : CItemBase(mainIndex, type) {
-}
-
-CFolderBase::CFolderBase(CFolderBase* parentItem, const Type type) : CItemBase(parentItem, type) {
-}
-
-CFolderBase::CFolderBase(CFolderBase* parentFolder, const QString& caption) : CItemBase(parentFolder){
-  setText(0, caption);
-}
-
-CFolderBase::~CFolderBase() {
-}
-
-const bool CFolderBase::isFolder() {
-  return true;
-}
-
-void CFolderBase::update() {
-  CItemBase::update();
-  if (isOpen() && childCount())
-    setPixmap(0, SmallIcon(CResMgr::mainIndex::openedFolder::icon, 16));
-  else
-    setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-}
-
-void CFolderBase::init() {
-  CItemBase::init();
-  setDropEnabled(false);
-  setDragEnabled(false);
-}
-
-/** No descriptions */
-void CFolderBase::setOpen( bool open ){
-  KListViewItem::setOpen(open);
-  update();
-}
-
-/** The function which renames this folder. */
-void CFolderBase::rename(){
-  startRename(0);
-}
-
-/** Creates a new sub folder of this folder. */
-void CFolderBase::newSubFolder(){
-  if (dynamic_cast<CBookmarkFolder*>(this) || dynamic_cast<Bookmarks::SubFolder*>(this) ) {
-    Bookmarks::SubFolder* f = new Bookmarks::SubFolder(this, i18n("New folder"));
-    f->init();
-
-    listView()->setCurrentItem(f);
-    listView()->ensureItemVisible(f);
-    f->rename();
-  }
-}
-
-/** Reimplementation. Returns true if the drop is accepted. */
-const bool CFolderBase::allowAutoOpen( const QMimeSource* ) const{
-  return true;
-}
-
-/** Reimplementation. Returns false because folders have no use for drops (except for the bookmark folders) */
-bool CFolderBase::acceptDrop(const QMimeSource*){
-//  qWarning("CFolderBase::acceptDrop");
-  return false;
-}
-
-/****************************************/
-/*****  class: CTreeFolder  *************/
-/****************************************/
-
-
-CTreeFolder::CTreeFolder(CMainIndex* mainIndex, const Type type, const QString& language) : CFolderBase(mainIndex, type) {
-  m_language = language;
-}
-
-CTreeFolder::CTreeFolder(CFolderBase* item, const Type type, const QString& language) : CFolderBase(item, type) {
-  m_language = language;
-}
-
-CTreeFolder::~CTreeFolder(){
-}
-
-void CTreeFolder::addGroup(const Type type, const QString language){
-  CTreeFolder* i = 0;
-  if (type == BookmarkFolder) {
-    i = new CBookmarkFolder(this);
-  }
-  else if (type == OldBookmarkFolder) {
-    i = new Bookmarks::OldBookmarksFolder(this);
-  }
-  else {
-    i = new CTreeFolder(this, type, language);
-  }
-  i->init();
-  if (!i->childCount())
-    delete i;
-}
-
-void CTreeFolder::addModule(CSwordModuleInfo* const module){
-  CModuleItem* i = new CModuleItem(this, module);
-  i->init();
-}
-
-void CTreeFolder::addBookmark(CSwordModuleInfo* module, const QString& key, const QString& description){
-  CBookmarkItem* i = new CBookmarkItem(this, module, key, description);
-  i->init();
-}
-
-void CTreeFolder::update(){
-  CFolderBase::update();
-}
-
-void CTreeFolder::init(){
-  if (language() == "*") {
-    switch (type()) {
-      case BibleModuleFolder:
-        setText(0,i18n("Bibles"));
-        break;
-      case CommentaryModuleFolder:
-        setText(0,i18n("Commentaries"));
-        break;
-      case LexiconModuleFolder:
-        setText(0,i18n("Lexicons"));
-        break;
-      case BookModuleFolder:
-        setText(0,i18n("Books"));
-        break;
-      case DevotionalModuleFolder:
-        setText(0,i18n("Daily devotionals"));
-        break;
-      case GlossaryModuleFolder:
-        setText(0,i18n("Glossaries"));
-        break;
-      case BookmarkFolder:
-        setText(0,i18n("Bookmarks"));
-        break;
-      case OldBookmarkFolder:
-        setText(0,i18n("Old bookmarks"));
-        break;
-      default:
-        setText(0, i18n("Unknown"));
-        break;
-    };
-  }
-  else {
-    CLanguageMgr::Language lang = languageMgr()->languageForAbbrev( language() );
-    
-    setText(0, !language().isEmpty() ? ( lang.isValid() ? lang.translatedName() : language()) : i18n("Unknown language"));
-  }
-  initTree();
-  update();
-}
-
-void CTreeFolder::initTree(){
-//  qWarning("CTreeMgr::initTree");
-  if (type() == Unknown)
-    return;
-
-  CSwordModuleInfo::ModuleType moduleType = CSwordModuleInfo::Unknown;
-  if (type() == BibleModuleFolder)
-    moduleType = CSwordModuleInfo::Bible;
-  else if (type() == CommentaryModuleFolder)
-    moduleType = CSwordModuleInfo::Commentary;
-  else if (type() == LexiconModuleFolder || type() == GlossaryModuleFolder || type() == DevotionalModuleFolder)
-    moduleType = CSwordModuleInfo::Lexicon;
-  else if (type() == BookModuleFolder)
-    moduleType = CSwordModuleInfo::GenericBook;
-
-  //get all modules by using the given type
-  ListCSwordModuleInfo allModules = backend()->moduleList();
-  ListCSwordModuleInfo usedModules;
-  for (CSwordModuleInfo* m = allModules.first(); m; m = allModules.next()) {
-    if (m->type() == moduleType) { //found a module, check if the type is correct (devotional etc.)
-      if (type() == GlossaryModuleFolder && !m->category() == CSwordModuleInfo::Glossary) { //not a gglossary
-        continue;
-      }
-      if (type() == DevotionalModuleFolder && (m->category() != CSwordModuleInfo::DailyDevotional)) {//not a devotional
-        continue;
-      }
-      if (type() == LexiconModuleFolder && ( (m->category() == CSwordModuleInfo::DailyDevotional) || (m->category() == CSwordModuleInfo::Glossary) )) {
-        //while looking for lexicons glossaries and devotionals shouldn't be used
-        continue;
-      }
-
-      if (language() == QString::fromLatin1("*") || (language() != QString::fromLatin1("*") && QString::fromLatin1(m->module()->Lang()) == language()) )//right type and language!
-        usedModules.append(m);
-    }
-  }
-
-  //we have now all modules we want to have
-  if (language() == QString::fromLatin1("*")) { //create subfolders for each language
-    QStringList usedLangs;
-    for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) {
-      QString lang = QString::fromLatin1(m->module()->Lang());
-//      if (lang.isEmpty())
-//        lang = ");
-      if (!usedLangs.contains(lang)) {
-        usedLangs.append(lang);
-      }
-    }
-    QStringList::iterator it;
-    for (it = usedLangs.begin(); it != usedLangs.end(); ++it) {
-      addGroup(/**it,*/ type(), *it);
-    }
-  }
-  else if (usedModules.count() > 0){ //create subitems with the given type and language
-    for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) {
-      addModule(m);
-    }
-  }
-
-  sortChildItems(0,true);
-}
-
-const QString& CTreeFolder::language() const {
-  return m_language;
-};
-
-/* --------------------------------------------------*/
-/* ---------- new class: CBookmarkFolder::SubFolder--*/
-/* --------------------------------------------------*/
-
-namespace Bookmarks {
-  /* --------------------------------------------------------------------------*/
-  /* ---------- new class: CBookmarkFolder::OldBookmarkImport -----------------*/
-  /* --------------------------------------------------------------------------*/
-  const QString OldBookmarkImport::oldBookmarksXML( const QString& configFileName ) {
-    QString fileName = (configFileName.isEmpty()) ? "bt-groupmanager" : configFileName;
-    KConfig* config = new KSimpleConfig( fileName );
-
-    KConfigGroupSaver groupSaver(config, configFileName.isEmpty() ? "Groupmanager" : "Bookmarks");
-
-    QDomDocument doc("DOC");
-    doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-
-    QDomElement content = doc.createElement("SwordBookmarks");
-    content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION);
-    doc.appendChild(content);
-
-    //first create the bookmark groups in the XML document, then add the bookmarks to each parent
-    QMap<int, QDomElement> parentMap; //maps parent ids to dom elements
-
-
-  	QStringList	groupList = config->readListEntry("Groups");
-  	QValueList<int>	parentList = config->readIntListEntry("Group parents");
-
-    QStringList::Iterator it_groups = groupList.begin();
-  	QValueList<int>::Iterator it_parents = parentList.begin();
-
-    int parentIDCounter = 0;
-  	while ( (it_groups != groupList.end()) && (it_parents != parentList.end()) ) {
-      QDomElement parentElement = (*it_parents == -1) ? content : parentMap[*it_parents];
-      if (parentElement.isNull()) {
-        qWarning("EMPTY PARENT FOUND!");
-        parentElement = content;
-      };
-
-      QDomElement elem = doc.createElement("Folder");
-      elem.setAttribute("caption", (*it_groups));
-      parentMap.insert(parentIDCounter, elem);
-
-      parentElement.appendChild( elem );
-
-
-  		++it_parents;
-    	++it_groups;
-      ++parentIDCounter;
-    }
-
-    //groups are now read in, create now the bookmarks
-  	parentList 	= config->readIntListEntry("Bookmark parents");
-    QStringList	bookmarkList 							= config->readListEntry("Bookmarks");
-  	QStringList	bookmarkModulesList 			= config->readListEntry("Bookmark modules");
-  	QStringList	bookmarkDescriptionsList 	= config->readListEntry("Bookmark descriptions");
-
-  	it_parents  = parentList.begin();
-  	QStringList::Iterator it_bookmarks 	  = bookmarkList.begin();
-  	QStringList::Iterator it_modules 		  = bookmarkModulesList.begin();
-  	QStringList::Iterator it_descriptions	= bookmarkDescriptionsList.begin();
-
-  	while ( it_bookmarks != bookmarkList.end()
-            && it_parents != parentList.end()
-  			 		&& it_modules != bookmarkModulesList.end()
-          )
-    {
-      QDomElement parentElement = ((*it_parents) == -1) ? content : parentMap[(*it_parents)];
-      if (parentElement.isNull()) {
-        qWarning("EMPTY PARENT FOUND!");
-        parentElement = content;
-      };
-      QDomElement elem = doc.createElement("Bookmark");
-
-      elem.setAttribute("key", *it_bookmarks);
-      elem.setAttribute("description", *it_descriptions);
-      elem.setAttribute("modulename", *it_modules);
-
-      CSwordModuleInfo* m = CPointers::backend()->findModuleByName( *it_modules );
-      elem.setAttribute("moduledescription", m ? m->config(CSwordModuleInfo::Description) : QString::null);
-
-      parentElement.appendChild( elem );
-
-
-  		++it_parents;
-  		++it_modules;
-  		++it_descriptions;
-  		++it_bookmarks;
-    };
-
-    return doc.toString();
-  };
-
- /********************
- *   New class: OldBookmarkFolder
- *********************/
-
- OldBookmarksFolder::OldBookmarksFolder(CTreeFolder* folder) : CBookmarkFolder(folder, OldBookmarkFolder) {
- }
-
- OldBookmarksFolder::~OldBookmarksFolder() {
- }
-
- /** Reimplementation to handle special bookmark tree. */
- void OldBookmarksFolder::initTree(){
-   // Import the bookmarks of the previous BibleTime versions
-   if (!CBTConfig::get( CBTConfig::readOldBookmarks )) { //if we havn't yet loaded the old bookmarks
-     loadBookmarksFromXML( Bookmarks::OldBookmarkImport::oldBookmarksXML() );
-   }
- }
-
-
- QDomElement OldBookmarksFolder::saveToXML( QDomDocument& doc ) {
-   QDomElement elem = doc.createElement("Folder");
-   elem.setAttribute("caption", text(0));
-
-   // Append the XML nodes of all child items
-   CItemBase* i = dynamic_cast<CItemBase*>(firstChild());
-   while( i ) {
-     if (i->parent() == this) {
-       QDomElement newElem = i->saveToXML( doc );
-       if (!newElem.isNull()) {
-         elem.appendChild( newElem ); //append to this folder
-       }
-     }
-     i = dynamic_cast<CItemBase*>( i->nextSibling() );
-   }
-
-   // Save to config, that we imported the old bookmarks and that we have them on disk
-   CBTConfig::set( CBTConfig::readOldBookmarks, true );
-
-   return elem;
- }
-
- void OldBookmarksFolder::loadFromXML( QDomElement& /*element*/ ) {
-   //this function is empty because the folder imports the old 1.2 bookmarks from the bt-groupmanager config file
- }
-
-
- // New class SubFolder
-
- SubFolder::SubFolder(CFolderBase* parentItem, const QString& caption) : CBookmarkFolder(parentItem, BookmarkFolder) {
-   m_startupXML = QDomElement();
-   setText( 0, caption );
- }
-
- SubFolder::SubFolder(CFolderBase* parentItem, QDomElement& xml ) : CBookmarkFolder(parentItem, BookmarkFolder) {
-   m_startupXML = xml;
- }
-
- SubFolder::~SubFolder() {
- }
-
- void SubFolder::init() {
-   CFolderBase::init();
-   if (!m_startupXML.isNull())
-     loadFromXML(m_startupXML);
-
-   setDropEnabled(true);
-   setRenameEnabled(0,true);
- }
-
-// /** Is called when an item was dropped on this subfolder. */
-// bool SubFolder::acceptDrop(const QMimeSource * src) const {
-//   return CDragDropMgr::canDecode(src) && (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark);
-// }
-
- /** Reimplementation from  CItemBase. */
- const bool SubFolder::enableAction(const MenuAction action){
-   if (action == ChangeFolder || action == NewFolder || action == DeleteEntries || action == ImportBookmarks )
-     return true;
-
-   if (action == ExportBookmarks || action == ImportBookmarks )
-     return true; //not yet implemented
-
-   return false;
- }
-
- /** Returns the XML code which represents the content of this folder. */
- QDomElement SubFolder::saveToXML( QDomDocument& doc ) {
-   /**
-   * Save all subitems (bookmarks and folders) to the XML file.
-   * We get the XML code for the items by calling their own saveToXML implementations.
-   */
-   QDomElement elem = doc.createElement("Folder");
-   elem.setAttribute("caption", text(0));
-
-   //append the XML nodes of all child items
-   CItemBase* i = dynamic_cast<CItemBase*>(firstChild());
-   while( i ) {
-     if (i->parent() == this) {
-       QDomElement newElem = i->saveToXML( doc );
-       if (!newElem.isNull()) {
-         elem.appendChild( newElem ); //append to this folder
-       }
-     }
-     i = dynamic_cast<CItemBase*>( i->nextSibling() );
-   }
-   return elem;
- }
-
- /** Loads the content of this folder from the XML code passed as argument to this function. */
- void SubFolder::loadFromXML( QDomElement& elem ) {
-   //get the caption and restore all child items!
-   if (elem.hasAttribute("caption"))
-     setText(0, elem.attribute("caption"));
-
-   //restore all child items
-   QDomElement child = elem.firstChild().toElement();
-   CItemBase* oldItem = 0;
-   while ( !child.isNull() && child.parentNode() == elem ) {
-     CItemBase* i = 0;
-     if (child.tagName() == "Folder") {
-       i = new Bookmarks::SubFolder(this, child);
-     }
-     else if (child.tagName() == "Bookmark") {
-       i = new CBookmarkItem(this, child);
-     }
-     i->init();
-     if (oldItem)
-       i->moveAfter(oldItem);
-     oldItem = i;
-
-     child = child.nextSibling().toElement();
-   }
- }
-};
-
-
-/* --------------------------------------------------*/
-/* ---------- new class: CBookmarkFolder ------------*/
-/* --------------------------------------------------*/
-
-CBookmarkFolder::CBookmarkFolder(CMainIndex* mainIndex, const Type type) : CTreeFolder(mainIndex, type, "*") {
-  setSortingEnabled(false);
-}
-
-CBookmarkFolder::CBookmarkFolder(CFolderBase* parentItem, const Type type) : CTreeFolder(parentItem, type, "*") {
-  setSortingEnabled(false);
-}
-
-CBookmarkFolder::~CBookmarkFolder() {
-}
-
-void CBookmarkFolder::initTree(){
-  addGroup(OldBookmarkFolder, "*");
-
-  KStandardDirs stdDirs;
- 	const QString path = stdDirs.saveLocation("data", "bibletime/");	
-  if (!path.isEmpty()) {
-    loadBookmarks(path + "bookmarks.xml");
-  }
-}
-
-/** Reimplementation. */
-const bool CBookmarkFolder::enableAction(const MenuAction action){
-  if (action == NewFolder || action == ImportBookmarks)
-    return true;
-
-  if (action == ExportBookmarks && childCount())
-    return true;
-
-  return false;
-}
-
-
-void CBookmarkFolder::exportBookmarks(){
-  QString fileName = KFileDialog::getSaveFileName(QString::null, i18n("*.btb | BibleTime bookmark files (*.btb)\n*.* | All files (*.*)"), 0, i18n("BibleTime - Export bookmarks"));
-  if (!fileName.isEmpty()) {
-    saveBookmarks( fileName, false ); //false means we don't want to overwrite the file without asking the user
-  };
-}
-
-
-void CBookmarkFolder::importBookmarks(){
-  QString fileName = KFileDialog::getOpenFileName(QString::null, i18n("*.btb | BibleTime bookmark files (*.btb)\n*.* | All files (*.*)"), 0, i18n("BibleTime - Import bookmarks"));
-  if (!fileName.isEmpty()) {
-    //we have to decide if we should load an old bookmark file from 1.2 or earlier or the new XML format of > 1.3    
-    if ( !loadBookmarks(fileName) ) { //if this failed try to load it as old bookmark file
-      loadBookmarksFromXML( Bookmarks::OldBookmarkImport::oldBookmarksXML( fileName ) );
-    };
-  };
-}
-
-bool CBookmarkFolder::acceptDrop(const QMimeSource * src) const {
-  qWarning("bool CBookmarkFolder::acceptDrop(const QMimeSource * src): return%ii", (CDragDropMgr::canDecode(src) && (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark)));
-  return (CDragDropMgr::canDecode(src) && (CDragDropMgr::dndType(src) == CDragDropMgr::Item::Bookmark));
-}
-
-void CBookmarkFolder::dropped(QDropEvent *e) {
-  qWarning("CBookmarkFolder::dropped?");
-  if (acceptDrop(e)) {
-    qWarning("CBookmarkFolder: item drop accepted");
-    CDragDropMgr::ItemList dndItems = CDragDropMgr::decode(e);
-
-    qWarning("decoded items: %i", dndItems.count() );
-    CDragDropMgr::ItemList::Iterator it;
-    CItemBase* previousItem = 0;
-    for( it = dndItems.begin(); it != dndItems.end(); ++it) {
-      CSwordModuleInfo* module = backend()->findModuleByName( (*it).bookmarkModule() );
-      CBookmarkItem* i = new CBookmarkItem(this, module, (*it).bookmarkKey(), (*it).bookmarkDescription());
-      qWarning("created new item");
-      if (previousItem) {
-        i->moveAfter( previousItem );
-        qWarning("moved new item");
-      }
-      i->init();
-      previousItem = i;
-    };
-  };
-}
-
-/** Saves the bookmarks in a file. */
-const bool CBookmarkFolder::saveBookmarks( const QString& filename, const bool& forceOverwrite ){
-  QDomDocument doc("DOC");
-  doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-
-  QDomElement content = doc.createElement("SwordBookmarks");
-  content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION);
-  doc.appendChild(content);
-
-  //append the XML nodes of all child items
-  CItemBase* i = dynamic_cast<CItemBase*>( firstChild() );
-  while( i ) {
-    if (i->parent() == this) { //only one level under this folder
-      QDomElement newElem = i->saveToXML( doc ); // the cild creates it's own XML code
-      if (!newElem.isNull()) {
-        content.appendChild( newElem ); //append to this folder
-      }
-    }
-    i = dynamic_cast<CItemBase*>( i->nextSibling() );
-  }
-
-	return CToolClass::savePlainFile(filename, doc.toString(), forceOverwrite, QTextStream::UnicodeUTF8);
-}
-
-const bool CBookmarkFolder::loadBookmarksFromXML( const QString& xml ){
-	QDomDocument doc;
-	doc.setContent(xml);
-  QDomElement document = doc.documentElement();
-  if( document.tagName() != "SwordBookmarks" ) {
-    qWarning("Not a BibleTime Bookmark XML file");
-		return false;
-	}
-
-  CItemBase* oldItem = 0;
-  //restore all child items
-  QDomElement child = document.firstChild().toElement();
-  while ( !child.isNull() && child.parentNode() == document) {
-    CItemBase* i = 0;
-    if (child.tagName() == "Folder") {
-      i = new Bookmarks::SubFolder(this, child);
-    }
-    else if (child.tagName() == "Bookmark") {
-      i = new CBookmarkItem(this, child);
-    }
-    if (!i) {
-      break;
-    }
-
-    i->init();
-    if (oldItem) {
-      i->moveAfter(oldItem);
-    }
-    oldItem = i;
-
-    if (!child.nextSibling().isNull()) {
-      child = child.nextSibling().toElement();
-    }
-    else {
-      break;
-    }
-  }
-  return true;
-}
-
-/** Loads bookmarks from a file. */
-const bool CBookmarkFolder::loadBookmarks( const QString& filename ){
-  QFile file(filename);	
-	if (!file.exists())
-		return false;
-
-  QString xml;	
-	if (file.open(IO_ReadOnly)) {		
-		QTextStream t;
-		t.setEncoding(QTextStream::UnicodeUTF8); //set encoding before file is used for input!
-		t.setDevice(&file);
-    xml = t.read();
-		file.close();	
-	}
-
-  return loadBookmarksFromXML( xml );
-}
-
-/* NEW CLASS */
-
-CGlossaryFolder::CGlossaryFolder(CMainIndex* mainIndex, const Type type, const QString& fromLanguage, const QString& toLanguage)
-  : CTreeFolder(mainIndex, type, fromLanguage)
-{
-  m_fromLanguage = fromLanguage;
-  m_toLanguage = toLanguage;  
-}
-
-CGlossaryFolder::CGlossaryFolder(CFolderBase* item, const Type type, const QString& fromLanguage, const QString& toLanguage)
-  : CTreeFolder(item, type, fromLanguage)
-{
-  m_fromLanguage = fromLanguage;
-  m_toLanguage = toLanguage;
-}
-
-CGlossaryFolder::~CGlossaryFolder(){
-}
-
-void CGlossaryFolder::initTree(){
-  if (type() == Unknown)
-    return;
-
-  //get all modules by using the lexicon type
-  ListCSwordModuleInfo allModules = backend()->moduleList();
-  ListCSwordModuleInfo usedModules;
-  for (CSwordModuleInfo* m = allModules.first(); m; m = allModules.next()) {
-    if (m->type() == CSwordModuleInfo::Lexicon) { //found a module, check if the type is correct (devotional etc.)
-      if ((type() == GlossaryModuleFolder) && (m->category() != CSwordModuleInfo::Glossary)) { //not a glossary
-        continue;
-      }
-      //found a glossary
-      if (language() == QString::fromLatin1("*")
-        || (language() != QString::fromLatin1("*")
-          && m->config(CSwordModuleInfo::GlossaryFrom) == fromLanguage()
-          && m->config(CSwordModuleInfo::GlossaryTo) == toLanguage()
-      )
-        )
-      { //right type and language!
-        usedModules.append(m);
-      }
-    }
-  }
-
-  //we have now all modules we want to have
-  if (language() == QString::fromLatin1("*")) { //create subfolders for each language
-    typedef std::pair<QString, QString> LanguagePair;
-    typedef QValueList<LanguagePair> LanguagePairList;
-    
-    LanguagePairList usedLangs;
-    for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) {
-      LanguagePair langPair( m->config(CSwordModuleInfo::GlossaryFrom), m->config(CSwordModuleInfo::GlossaryTo) );
-      if (!usedLangs.contains(langPair)) {
-        usedLangs.append(langPair);
-      }
-    }
-    LanguagePairList::iterator it;
-    for (it = usedLangs.begin(); it != usedLangs.end(); ++it) {
-      addGroup(type(), (*it).first, (*it).second);
-    }
-  }
-  else if (usedModules.count() > 0){ //create subitems with the given type and languages
-    for (CSwordModuleInfo* m = usedModules.first(); m; m = usedModules.next()) {
-      addModule(m);
-    }
-  }
-
-  sortChildItems(0,true);  
-}
-
-void CGlossaryFolder::init(){
-  if (language() == "*") {
-    setText(0,i18n("Glossaries"));
-  }
-  else {
-    CLanguageMgr::Language fromLang = languageMgr()->languageForAbbrev( m_fromLanguage );    
-    CLanguageMgr::Language toLang = languageMgr()->languageForAbbrev( m_toLanguage );
-
-    QString fromLangString  = fromLang.translatedName();
-    QString toLangString    = toLang.translatedName();
-        
-    if (fromLangString.isEmpty()) { //use abbrev!
-      fromLangString = m_fromLanguage;
-    };
-    if (toLangString.isEmpty()) { //use abbrev!
-      toLangString = m_toLanguage;
-    };
-    
-        
-    setText(0, fromLangString + " - " + toLangString );
-  }
-  initTree();
-  update();
-}
-
-/** Returns the language this glossary folder maps from. */
-const QString& CGlossaryFolder::fromLanguage() const{
-  return m_fromLanguage;
-}
-
-/** Returns the language this glossary folder maps to. */
-const QString& CGlossaryFolder::toLanguage() const{
-  return m_toLanguage;
-}
-
-void CGlossaryFolder::addGroup(const Type type, const QString& fromLanguage, const QString& toLanguage) {
-  CTreeFolder* i = new CGlossaryFolder(this, type, fromLanguage, toLanguage);
-  i->init();
-  if (!i->childCount())
-    delete i;
-}
-
diff --git a/bibletime/frontend/mainindex/cindexitem.h b/bibletime/frontend/mainindex/cindexitem.h
deleted file mode 100644
index c0fc642..0000000
--- a/bibletime/frontend/mainindex/cindexitem.h
+++ /dev/null
@@ -1,379 +0,0 @@
-/***************************************************************************
-                          cindexitem.h  -  description
-                             -------------------
-    begin                : Sam Jun 22 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CINDEXITEM_H
-#define CINDEXITEM_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-
-#include "backend/cswordmoduleinfo.h"
-
-//Qt includes
-#include <qdom.h>
-
-//KDE includes
-#include <klistview.h>
-
-class KConfig;
-class CFolderBase;
-class CTreeFolder;
-class CMainIndex;
-
-class CItemBase : public KListViewItem, public CPointers {
-public:
-  enum Type {
-    Unknown = 0,
-    BookmarkFolder,
-    Bookmark,
-    OldBookmarkFolder, /* Bookmarks in the old format from BibleTime 1.1.x and 1.2.x */
-    BibleModuleFolder,
-    CommentaryModuleFolder,
-    LexiconModuleFolder,
-    BookModuleFolder,
-    DevotionalModuleFolder,
-    GlossaryModuleFolder,
-    ModuleLanguageFolder,
-    Module
-  };
-  enum MenuAction {
-    NewFolder = 0,
-    ChangeFolder,
-
-    ChangeBookmark,
-    ImportBookmarks,
-    ExportBookmarks,
-    PrintBookmarks,
-
-    DeleteEntries,
-
-    EditModule,
-    SearchInModules,
-    UnlockModule,
-    AboutModule,
-
-    ActionBegin = NewFolder,
-    ActionEnd = AboutModule
-  };
-
-  CItemBase(CMainIndex* mainIndex, const Type type = Unknown);
-  CItemBase(CItemBase* item, const Type type = Unknown);
-
-  virtual ~CItemBase();
-  virtual const QString toolTip();
-  virtual CMainIndex* listView() const;
-  /**
-  * Returns if the implementation of this class is a folder item or not.
-  * Reimplement this function to return the correct value.
-  */
-  virtual const bool isFolder() { return false; };
-  const Type& type() const;
-
-  virtual void init();
-  virtual void update();
-  void moveAfter( CItemBase* const item );
-  /**
-  * Returns true if the given action should be enabled in the popup menu.
-  */
-  virtual const bool enableAction( const MenuAction action );
-  virtual const bool isMovable();
-
-  /**
-  * Returns the XML code which represents the content of this folder.
-  */
-  virtual QDomElement saveToXML( QDomDocument& /*document*/ ) { return QDomElement(); };
-  /**
-  * Loads the content of this folder from the XML code passed as argument to this function.
-  */
-  virtual void loadFromXML( QDomElement& /*element*/ ) {};
-  /**
-  * Returns true whether the sorting is enabled or not.
-  */
-  const bool isSortingEnabled();
-  /**
-  * This function engables or disables sorting depending on the parameter.
-  */
-  void setSortingEnabled( const bool& enableSorting );
-  /**
-  * Reimplementation which takes care of the our isSortingEnabled() setting.
-  */
-  virtual void sortChildItems( int col, bool asc );
-  /**
-  * Reimplementation which takes care of the our isSortingEnabled() setting.
-  */
-  virtual void sort();
-
-protected:
-  friend class CMainIndex;
-  virtual void dropped( QDropEvent* e );
-  /**
-  * Reimplementation. Returns true if the auto opening of this folder is allowd
-  * The default return value is "false"
-  */
-  virtual const bool allowAutoOpen( const QMimeSource* src ) const;
-  
-private:
-  Type m_type;
-  bool m_sortingEnabled;
-};
-
-class CModuleItem : public CItemBase {
-public:
-	CModuleItem(CTreeFolder* item, CSwordModuleInfo* module);
-	virtual ~CModuleItem();
-  virtual CSwordModuleInfo* const module() const;
-  virtual const QString toolTip();
-
-  /**
-  * Reimplementation from  CItemBase.
-  */
-  virtual const bool enableAction( const MenuAction action );
-  virtual void update();
-  virtual void init();
-  /**
-  * Returns the about module info of the used module.
-  */
-  const QString aboutInfo();
-
-protected: // Protected methods
-  /**
-  * Reimplementation to handle text drops on a module.
-  * In this case open the searchdialog. In the case of a referebnce open the module at the given position.
-  */
-  virtual bool acceptDrop( const QMimeSource* src ) const;
-  virtual void dropped( QDropEvent* e );
-
-private:
-  CSwordModuleInfo* m_module;
-};
-
-class CBookmarkItem : public CItemBase {
-public:
-	CBookmarkItem(CFolderBase* parentItem, CSwordModuleInfo* module, const QString& key, const QString& description);
-	CBookmarkItem(CFolderBase* parentItem, QDomElement& xml);
-	~CBookmarkItem();
-  CSwordModuleInfo* const module();
-  const QString key();
-  const QString& description();
-  virtual const QString toolTip();
-
-  virtual void update();
-  virtual void init();
-  virtual const bool isMovable();
-  /**
-  * Reimplementation to handle  the menu entries of the main index.
-  */
-  virtual const bool enableAction(const MenuAction action);
-  /**
-  * Prints this bookmark.
-  */
-  void print();
-  /**
-  * Changes this bookmark.
-  */
-  void rename();
-  /**
-  * Reimplementation of CItemBase::saveToXML.
-  */
-  virtual QDomElement saveToXML( QDomDocument& document );
-  /**
-  * Loads the content of this folder from the XML code passed as argument to this function.
-  */
-  virtual void loadFromXML( QDomElement& element );
-
-private:
-  QString m_key;
-  QString m_description;
-  QString m_moduleName;
-
-  QDomElement m_startupXML;
-
-private: // Private methods
-  /**
-  * Returns the english key.
-  * Only used internal of this class implementation.
-  */
-  const QString& englishKey();
-protected: // Protected methods
-  /**
-  * Reimplementation. Returns false everytime
-  * because a bookmarks 
-  * has not possible drops.
-  */
-  virtual bool acceptDrop(const QMimeSource * src);
-  /**
-  * Compares this item to another one. Used for sorting.
-  */
-//  virtual int compare( QListViewItem*, int col, bool ascending) const;
-};
-
-
-class CFolderBase : public CItemBase {
-public:
-  CFolderBase(CMainIndex* mainIndex, const Type type);
-  CFolderBase(CFolderBase* parentFolder, const Type type);
-  CFolderBase(CFolderBase* parentFolder, const QString& caption);
-  virtual ~CFolderBase();
-
-  virtual const bool isFolder();
-
-  virtual void update();
-  virtual void init();
-  virtual void setOpen( bool open );
-  /**
-  * The function which renames this folder.
-  */
-  void rename();
-  virtual void newSubFolder();
-
-protected:
-  /**
-  * Reimplementation. Returns true if the auto opening of this folder is allowd
-  */
-  virtual const bool allowAutoOpen( const QMimeSource* src ) const;  
-  /** Reimplementation. Returns false because folders have no use for drops (except for the bookmark folders) */
-  bool acceptDrop(const QMimeSource * src);
-};
-
-/** The base class for all items in the tree. Subclasses for module folders, modules and bookmarks exist.
-  * @author The BibleTime team
-  */
-class CTreeFolder : public CFolderBase {
-public: 
-	CTreeFolder(CMainIndex* mainIndex, const Type type, const QString& language );
-	CTreeFolder(CFolderBase* parentFolder, const Type type, const QString& language );
-	~CTreeFolder();
-  virtual void addGroup(const Type type, const QString language);
-  virtual void addModule(CSwordModuleInfo* const);
-  virtual void addBookmark(CSwordModuleInfo* module, const QString& key, const QString& description);
-
-  virtual void initTree();
-
-  virtual void update();
-  virtual void init();
-
- virtual const QString& language() const;
-
-private:
-  QString m_language;
-};
-
-class CGlossaryFolder : public CTreeFolder {
-public:
-	CGlossaryFolder(CMainIndex* mainIndex, const Type type, const QString& fromLanguage, const QString& toLanguage );
-	CGlossaryFolder(CFolderBase* parentFolder, const Type type, const QString& fromLanguage, const QString& toLanguage );
-	~CGlossaryFolder();
-  
-  virtual void initTree();
-  virtual void init();
-  virtual void addGroup(const Type type, const QString& fromLanguage, const QString& toLanguage);
-  /**
-  * Returns the language this glossary folder maps from.
-  */
-  const QString& fromLanguage() const;
-  /**
-  * Returns the language this glossary folder maps from.
-  */
-  const QString& toLanguage() const;
-
-private:
-  QString m_fromLanguage;
-  QString m_toLanguage;  
-};
-
-class CBookmarkFolder : public CTreeFolder {
-public:
-	CBookmarkFolder(CMainIndex* mainIndex, const Type type = BookmarkFolder);
-	CBookmarkFolder(CFolderBase* parentItem, const Type type = BookmarkFolder);
-	virtual ~CBookmarkFolder();
-  virtual const bool enableAction(const MenuAction action);
-  virtual void exportBookmarks();
-  virtual void importBookmarks();
-  virtual bool acceptDrop(const QMimeSource * src) const;
-  virtual void dropped(QDropEvent *e);
-
-  /**
-  * Loads bookmarks from XML content
-  */
-  const bool loadBookmarksFromXML( const QString& xml );
-  /**
-  * Loads bookmarks from a file.
-  */
-  const bool loadBookmarks( const QString& );
-  /**
-  * Saves the bookmarks in a file.
-  */
-  const bool saveBookmarks( const QString& filename, const bool& forceOverwrite = true );
-
-protected: // Protected methods
-  virtual void initTree();
-};
-
-
-namespace Bookmarks {
-  class OldBookmarksFolder : public CBookmarkFolder {
-  public:
-  	OldBookmarksFolder(CTreeFolder* item);
-  	virtual ~OldBookmarksFolder();
-    virtual void initTree();
-    /**
-    * Returns the XML code which represents the content of this folder.
-    */
-    virtual QDomElement saveToXML( QDomDocument& document );
-    /**
-    * Loads the content of this folder from the XML code passed as argument to this function.
-    */
-    virtual void loadFromXML( QDomElement& element );
-  };
-
-  class OldBookmarkImport {
-  public:
-    /**
-    * This function converts the old config based bookmarks into a valid 1.3 XML file, so importing is easy
-    */
-    static const QString oldBookmarksXML( const QString& configFileName = QString::null );
-  private:
-  // made provate because we offer one static functions which doesn't need constructor and destructor
-    OldBookmarkImport();
-    ~OldBookmarkImport();    
-  };
-      
-  class SubFolder : public CBookmarkFolder {
-  public:
-    SubFolder(CFolderBase* parentItem, const QString& caption);
-    SubFolder(CFolderBase* parentItem, QDomElement& xml);
-    virtual ~SubFolder();
-    virtual void init();
-    /**
-    * Reimplementation from  CItemBase.
-    */
-    const bool enableAction(const MenuAction action);
-    /**
-    * Returns the XML code which represents the content of this folder.
-    */
-    virtual QDomElement saveToXML( QDomDocument& document );
-    /**
-    * Loads the content of this folder from the XML code passed as argument to this function.
-    */
-    virtual void loadFromXML( QDomElement& element );
-
-  private:
-    QDomElement m_startupXML;
-  };
-};
-  
-#endif
diff --git a/bibletime/frontend/mainindex/cmainindex.cpp b/bibletime/frontend/mainindex/cmainindex.cpp
deleted file mode 100644
index fe7279a..0000000
--- a/bibletime/frontend/mainindex/cmainindex.cpp
+++ /dev/null
@@ -1,634 +0,0 @@
-/***************************************************************************
-                          cmainindex.cpp  -  description
-                             -------------------
-    begin                : Sam Jun 22 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cmainindex.h"
-#include "cindexitem.h"
-
-#include "backend/creferencemanager.h"
-#include "backend/cswordmoduleinfo.h"
-
-#include "frontend/searchdialog/csearchdialog.h"
-#include "frontend/cbtconfig.h"
-#include "frontend/cdragdropmgr.h"
-
-#include "util/cresmgr.h"
-
-//Qt includes
-#include <qheader.h>
-#include <qwhatsthis.h>
-#include <qlistview.h>
-#include <qdragobject.h>
-#include <qinputdialog.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kstandarddirs.h>
-#include <kpopupmenu.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
-
-CMainIndex::ToolTip::ToolTip(QWidget* parent) : CToolTip(parent) {
-}
-
-void CMainIndex::ToolTip::maybeTip(const QPoint& p) {
-	if (!parentWidget()->inherits("CMainIndex"))
-		return;
-	
-	CMainIndex* m = 0;
-	if ( !(m = dynamic_cast<CMainIndex*>(parentWidget())) )
-		return;	
-
-  CItemBase* i = 0;
-	if ( !( i = dynamic_cast<CItemBase*>(m->itemAt(p))) )
-		return;
-	
-	QRect r = m->itemRect(i);
-	if (!r.isValid()) {
-		return;
-  }
-	
-	//get type of item and display correct text
-	const QString text = i->toolTip();
-	if (!text.isEmpty()) {
-    	QPoint globalPoint = m->viewport()->mapTo(m, p);
-		tip(globalPoint, r, text);
-	}
-}
-
-/*new class : CMainIndex*/
-CMainIndex::CMainIndex(QWidget *parent) : KListView(parent),
-  m_searchDialog(0), m_toolTip(0), m_itemsMovable(false), m_autoOpenFolder(0), m_autoOpenTimer(this)
-{
-  initView();
-  initConnections();
-}
-
-CMainIndex::~CMainIndex(){
-  saveBookmarks();
-}
-
-/** Reimplementation. Adds the given group to the tree. */
-void CMainIndex::addGroup(const CItemBase::Type type, const QString language){
-  CTreeFolder *i = 0;
-  switch (type) {
-    case CItemBase::BookmarkFolder:
-      i = new CBookmarkFolder(this);
-      break;
-    case CItemBase::GlossaryModuleFolder:
-      i = new CGlossaryFolder(this, type, language, QString::null); //we have no second language
-      break;
-    default:
-      i = new CTreeFolder(this, type, language);
-      break;     
-  }
-  if (i) {
-    i->init();
-    if (i->childCount() == 0 && type != CItemBase::BookmarkFolder) {
-      delete i;
-    }
-  }
-}
-
-
-/** Initializes the view. */
-void CMainIndex::initView(){
- 	addColumn(QString::null);
- 	header()->hide();
-
- 	m_toolTip = new ToolTip(this);
-	setTooltipColumn(-1);
-	setShowToolTips(false);//to disable Qt's tooltips
-
-	setBackgroundMode(PaletteBase);
-	setFullWidth(true);
-
-	setAcceptDrops( true );
-	setDragEnabled( true );
-	setDropVisualizer( true );
- 	setDropHighlighter( true );
-  setAutoOpen(true);
-	viewport()->setAcceptDrops(true);
- 	setRootIsDecorated(false);
- 	setAllColumnsShowFocus(true);
-  setItemsMovable(false);
-  setSelectionModeExt(Extended);
-
-  //setup the popup menu
-  m_popup = new KPopupMenu(viewport());
-  m_popup->insertTitle(i18n("Main index"));
-
-  m_actions.newFolder = new KAction(i18n("Create a new folder"), CResMgr::mainIndex::newFolder::icon, 0, this, SLOT(createNewFolder()), this);
-  m_actions.changeFolder = new KAction(i18n("Change this folder"),CResMgr::mainIndex::changeFolder::icon, 0, this, SLOT(changeFolder()), this);
-
-  m_actions.changeBookmark = new KAction(i18n("Change this bookmark"),CResMgr::mainIndex::changeBookmark::icon, 0, this, SLOT(changeBookmark()), this);
-  m_actions.importBookmarks = new KAction(i18n("Import bookmarks"),CResMgr::mainIndex::importBookmarks::icon, 0, this, SLOT(importBookmarks()), this);
-  m_actions.exportBookmarks = new KAction(i18n("Export bookmarks"),CResMgr::mainIndex::exportBookmarks::icon, 0, this, SLOT(exportBookmarks()), this);
-  m_actions.printBookmarks = new KAction(i18n("Print bookmarks"),CResMgr::mainIndex::printBookmarks::icon, 0, this, SLOT(printBookmarks()), this);
-
-  m_actions.deleteEntries = new KAction(i18n("Remove selected item(s)"),CResMgr::mainIndex::deleteItems::icon, 0, this, SLOT(deleteEntries()), this);
-
-  m_actions.editModuleMenu = new KActionMenu(i18n("Edit this module"),CResMgr::mainIndex::editModuleMenu::icon, this);
-  m_actions.editModulePlain = new KAction(i18n("Plain text"),CResMgr::mainIndex::editModulePlain::icon, 0, this, SLOT(editModulePlain()), this);
-  m_actions.editModuleHTML = new KAction(i18n("HTML"),CResMgr::mainIndex::editModuleHTML::icon, 0, this, SLOT(editModuleHTML()), this);
-
-  m_actions.searchInModules = new KAction(i18n("Search in selected module(s)"),CResMgr::mainIndex::search::icon, 0, this, SLOT(searchInModules()), this);
-  m_actions.unlockModule = new KAction(i18n("Unlock this module"),CResMgr::mainIndex::unlockModule::icon, 0, this, SLOT(unlockModule()), this);
-  m_actions.aboutModule = new KAction(i18n("About this module"),CResMgr::mainIndex::aboutModule::icon, 0, this, SLOT(aboutModule()), this);
-
-
-  m_actions.newFolder->plug(m_popup);
-  m_actions.changeFolder->plug(m_popup);
-  (new KActionSeparator(this))->plug(m_popup);
-  m_actions.changeBookmark->plug(m_popup);
-  m_actions.importBookmarks->plug(m_popup);
-  m_actions.exportBookmarks->plug(m_popup);
-  m_actions.printBookmarks->plug(m_popup);
-  (new KActionSeparator(this))->plug(m_popup);
-  m_actions.deleteEntries->plug(m_popup);
-  (new KActionSeparator(this))->plug(m_popup);
-  m_actions.editModuleMenu->plug(m_popup);
-  m_actions.editModuleMenu->insert(m_actions.editModulePlain); //sub item of edit module menu
-  m_actions.editModuleMenu->insert(m_actions.editModuleHTML);  //sub item of edit module menu
-  
-  m_actions.searchInModules->plug(m_popup);
-  m_actions.unlockModule->plug(m_popup);
-  m_actions.aboutModule->plug(m_popup);
-}
-
-/** Initialize the SIGNAL<->SLOT connections */
-void CMainIndex::initConnections(){
-  connect(this, SIGNAL(executed(QListViewItem*)),
-    SLOT(slotExecuted(QListViewItem*)));
-  connect(this, SIGNAL(dropped(QDropEvent*, QListViewItem*, QListViewItem*)),
-    SLOT(dropped(QDropEvent*, QListViewItem*, QListViewItem*)));
-//  connect(this, SIGNAL(moved( QPtrList<QListViewItem>& items, QPtrList<QListViewItem>& afterFirst, QPtrList<QListViewItem>& afterNow)),
-//    SLOT(moved( QPtrList<QListViewItem>& items, QPtrList<QListViewItem>& afterFirst, QPtrList<QListViewItem>& afterNow)));
-  connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)),
-    SLOT(contextMenu(KListView*, QListViewItem*, const QPoint&)));
-  connect(&m_autoOpenTimer, SIGNAL(timeout()),
-    this, SLOT(autoOpenTimeout()));
-}
-
-/** Is called when an item was clicked/double clicked. */
-void CMainIndex::slotExecuted( QListViewItem* i ){
-  CItemBase* ci = dynamic_cast<CItemBase*>(i);
-  if (!ci)
-    return;
-
-  if (ci->isFolder()) {
-    i->setOpen(!i->isOpen());
-  }
-  else if (CModuleItem* m = dynamic_cast<CModuleItem*>(i))  { //clicked on a module
-    CSwordModuleInfo* mod = m->module();
-    ListCSwordModuleInfo modules;
-    modules.append(mod);
-    emit createReadDisplayWindow(modules, QString::null);
-  }
-  else if (CBookmarkItem* b = dynamic_cast<CBookmarkItem*>(i) ) { //clicked on a bookmark
-    if (CSwordModuleInfo* mod = b->module()) {
-      ListCSwordModuleInfo modules;
-      modules.append(mod);
-      emit createReadDisplayWindow(modules, b->key());
-    }
-  }
-}
-
-/** Reimplementation. Returns the drag object for the current selection. */
-QDragObject* CMainIndex::dragObject() {
-  if (!m_itemsMovable) {
-    return false;
-  };
-  
-  CDragDropMgr::ItemList dndItems;
-  
-  QPtrList<QListViewItem> items = selectedItems();
-  for (items.first(); items.current(); items.next()) {
-    if (CItemBase* i = dynamic_cast<CItemBase*>(items.current())) {
-      //we can move this item!
-      if (!i->isMovable()) { //we can only drag items which allow us to do it, e.g. which are movable
-        continue;
-      };
-
-      if (CBookmarkItem* bookmark = dynamic_cast<CBookmarkItem*>( items.current() )) {
-        //take care of bookmarks which have no valid module any more, e.g. if it was uninstalled
-        const QString moduleName = bookmark->module() ? bookmark->module()->name() : QString::null;
-        dndItems.append( CDragDropMgr::Item(moduleName, bookmark->key(), bookmark->description()) );
-      }
-    }
-  }
-
-  return CDragDropMgr::dragObject( dndItems, viewport() );
-}
-
-/** Reimplementation from KListView. Returns true if the drag is acceptable for the listview. */
-bool CMainIndex::acceptDrag( QDropEvent* event ) const {
-//  qWarning("CMainIndex::acceptDrag( QDropEvent* event )");
-
-  const QPoint pos = contentsToViewport(event->pos());
-  if (CItemBase* i = dynamic_cast<CItemBase*>(itemAt(pos))) {
-    return i->acceptDrop(event);
-  }
-  return false;
-}
-
-/** No descriptions */
-void CMainIndex::initTree(){
-  addGroup(CItemBase::BookmarkFolder, QString::fromLatin1("*"));
-  addGroup(CItemBase::BibleModuleFolder, QString::fromLatin1("*"));
-  addGroup(CItemBase::BookModuleFolder, QString::fromLatin1("*"));
-  addGroup(CItemBase::CommentaryModuleFolder, QString::fromLatin1("*"));
-  addGroup(CItemBase::DevotionalModuleFolder, QString::fromLatin1("*"));
-  addGroup(CItemBase::GlossaryModuleFolder, QString::fromLatin1("*"));
-  addGroup(CItemBase::LexiconModuleFolder, QString::fromLatin1("*"));
-}
-
-/** No descriptions */
-void CMainIndex::dropped( QDropEvent* e, QListViewItem* parent, QListViewItem* after){
-//  qWarning("CMainIndex::dropped");
-   Q_ASSERT(after);
-   Q_ASSERT(parent);
-
- 	if (after)
- 		qWarning("DROP AFTER %s", after->text(0).latin1());
- 	if (parent)
- 		qWarning("DROP parent %s", parent->text(0).latin1());
-
-  //the drop was started in this main index widget
-  if (m_itemsMovable && e->source() == viewport()) {
-    /*
-    * If the drag was started from the main index and should move items and if the destination is the bookmark
-    * folder or one of its subfolders
-    * we remove the current items because the new ones will be inserted soon.
-    */
-    if (dynamic_cast<CBookmarkFolder*>(parent) || dynamic_cast<Bookmarks::SubFolder*>(parent)) { //we drop onto the bookmark folder or one of it's subfolders
-      QPtrList<QListViewItem> items = selectedItems();
-      items.setAutoDelete(true);
-      items.clear(); //delete the selected items we dragged
-    };
-  };
-
-  //finally do the drop, either with external drop data or with the moved items' data
-	CItemBase* parentItem = dynamic_cast<CItemBase*>(parent);
-	CItemBase* afterItem = dynamic_cast<CItemBase*>(after);
-	if (afterItem && afterItem->isFolder()) {
-			afterItem->setOpen(true);
-			afterItem->dropped(e);
-	}
-	else if (afterItem && !afterItem->isFolder() && parentItem) {
-			parentItem->setOpen(true);
-			parentItem->dropped(e);
-	}
-	else if (parentItem) {
-			parentItem->setOpen(true);
-			parentItem->dropped(e);
-	}
-}
-
-/** No descriptions */
-void CMainIndex::emitModulesChosen( ListCSwordModuleInfo modules, QString key ){
-  emit createReadDisplayWindow(modules, key);
-}
-
-/** Returns the correct KAction object for the given type of action. */
-KAction* const CMainIndex::action( const CItemBase::MenuAction type ) const {
-  switch (type) {
-    case CItemBase::NewFolder:
-      return m_actions.newFolder;
-    case CItemBase::ChangeFolder:
-      return m_actions.changeFolder;
-
-    case CItemBase::ChangeBookmark:
-      return m_actions.changeBookmark;
-    case CItemBase::ImportBookmarks:
-      return m_actions.importBookmarks;
-    case CItemBase::ExportBookmarks:
-      return m_actions.exportBookmarks;
-    case CItemBase::PrintBookmarks:
-      return m_actions.printBookmarks;
-
-    case CItemBase::DeleteEntries:
-      return m_actions.deleteEntries;
-      
-    case CItemBase::EditModule:
-      return m_actions.editModuleMenu;
-    case CItemBase::SearchInModules:
-      return m_actions.searchInModules;
-    case CItemBase::UnlockModule:
-      return m_actions.unlockModule;
-    case CItemBase::AboutModule:
-      return m_actions.aboutModule;
-    default:
-      return 0;
-  };
-}
-
-/** Shows the context menu at the given position. */
-void CMainIndex::contextMenu(KListView* /*list*/, QListViewItem* i, const QPoint& p){
-  //setup menu entries depending on current selection
-  QPtrList<QListViewItem> items = selectedItems();
-
-  if (items.count() == 0) { //special handling for no selection
-
-  }
-  else if (items.count() == 1) { //special handling for one selected item
-    CItemBase* item = dynamic_cast<CItemBase*>(i);
-    CItemBase::MenuAction actionType;
-    for (int index = CItemBase::ActionBegin; index <= CItemBase::ActionEnd; ++index) {
-      actionType = static_cast<CItemBase::MenuAction>(index);
-      if (KAction* a = action(actionType))
-        a->setEnabled( item->enableAction(actionType) );
-    }
-  }
-  else {
-    //first disable all actions
-    CItemBase::MenuAction actionType;
-    for (int index = CItemBase::ActionBegin; index <= CItemBase::ActionEnd; ++index) {
-      actionType = static_cast<CItemBase::MenuAction>(index);
-      if (KAction* a = action(actionType))
-        a->setEnabled(false);
-    }
-
-    for (int index = CItemBase::ActionBegin; index <= CItemBase::ActionEnd; ++index) {
-      actionType = static_cast<CItemBase::MenuAction>(index);
-      bool enableAction = isMultiAction(actionType);
-      for (items.first(); items.current(); items.next()) {
-        CItemBase* i = dynamic_cast<CItemBase*>(items.current());
-        enableAction = enableAction && i->enableAction(actionType);
-      }
-      if (enableAction) {
-        KAction* a = action(actionType) ;
-        if (i && a)
-          a->setEnabled(enableAction);
-      }
-    }
-  }
-  m_popup->exec(p);
-}
-
-/** Adds a new subfolder to the current item. */
-void CMainIndex::createNewFolder(){
-  if (CFolderBase* i = dynamic_cast<CFolderBase*>(currentItem()) ) {
-    i->newSubFolder();
-  }
-}
-
-/** Opens a dialog to change the current folder. */
-void CMainIndex::changeFolder(){
-  if (CFolderBase* i = dynamic_cast<CFolderBase*>(currentItem()) ) {
-    i->rename();
-  }
-}
-
-/** Changes the current bookmark. */
-void CMainIndex::changeBookmark(){
-  if (CBookmarkItem* i = dynamic_cast<CBookmarkItem*>(currentItem()) ) {
-    i->rename();
-  }
-}
-
-/** Exports the bookmarks being in the selected folder. */
-void CMainIndex::exportBookmarks(){
-  if (CBookmarkFolder* i = dynamic_cast<CBookmarkFolder*>(currentItem()) ) {
-    i->exportBookmarks();
-  }
-}
-
-/** Import bookmarks from a file and add them to the selected folder. */
-void CMainIndex::importBookmarks(){
-  if (CBookmarkFolder* i = dynamic_cast<CBookmarkFolder*>(currentItem()) ) {
-    i->importBookmarks();
-  }
-}
-
-/** Prints the selected bookmarks. */
-void CMainIndex::printBookmarks(){
-  QPtrList<QListViewItem> items = selectedItems();
-  for (items.first(); items.current(); items.next()) {
-    if (CBookmarkItem* i = dynamic_cast<CBookmarkItem*>(items.current())) {
-      i->print();
-    }
-  }
-}
-
-/** Deletes the selected entries. */
-void CMainIndex::deleteEntries() {
-  QPtrList<QListViewItem> items = selectedItems();
-	if (!items.count())
-		return;
-
-	if (KMessageBox::warningYesNo(this, i18n("Do you really want to delete the selected items and child-items?"), i18n("Delete Items")) != KMessageBox::Yes) {
-		return;
-	}
-
-// We have to go backwards because otherwise deleting folders would delete their childs => crash
-  for (items.last(); items.current(); items.prev()) {
-    if (CItemBase* i = dynamic_cast<CItemBase*>(items.current())) {
-      if (i->enableAction(CItemBase::DeleteEntries)) {
-        delete i;
-      }
-    }
-  }
-}
-
-/** Opens the searchdialog for the selected modules. */
-void CMainIndex::searchInModules(){
-  QPtrList<QListViewItem> items = selectedItems();
-  ListCSwordModuleInfo modules;
-  for (items.first(); items.current(); items.next()) {
-    if (CModuleItem* i = dynamic_cast<CModuleItem*>(items.current())) {
-      if (i->module())
-        modules.append(i->module());
-    }
-  }
-
-  if (modules.isEmpty()) { //get a list of useful default modules for the search if no modules were selected
-    CSwordModuleInfo* m = CPointers::backend()->findModuleByDescription( CBTConfig::get(CBTConfig::standardBible ));
-    if (m)
-      modules.append(m);
-  }
-
-  CSearchDialog::openDialog(modules, QString::null);
-}
-
-/** Unlocks the current module. */
-void CMainIndex::unlockModule(){
-  if (CModuleItem* i = dynamic_cast<CModuleItem*>(currentItem())) {
-  	bool ok;
-  	QString unlockKey = QInputDialog::getText(i18n("BibleTime - Unlock module"),i18n("Enter the unlock key for this module."),QLineEdit::Normal, i->module()->config(CSwordModuleInfo::CipherKey), &ok);
-  	if (ok) {
-  		/*const bool ret =*/ i->module()->unlock( unlockKey );
-//  		if ( !ret ) { // an error occured
-//
-//  		}
-  	}
-  }
-}
-
-/** Shows information about the current module. */
-void CMainIndex::aboutModule(){
-  if (CModuleItem* i = dynamic_cast<CModuleItem*>(currentItem())) {
-  	KMessageBox::about(this, i->aboutInfo(), i->module()->config(CSwordModuleInfo::Description), false);
-  }
-}
-
-/** Reimplementation. Takes care of movable items. */
-void CMainIndex::startDrag(){
-  QPtrList<QListViewItem> items = selectedItems();
-  m_itemsMovable = true;
-  for (items.first(); items.current() && m_itemsMovable; items.next()) {
-    if (CItemBase* i = dynamic_cast<CItemBase*>(items.current())) {
-      m_itemsMovable = m_itemsMovable && i->isMovable();
-    }
-    else {
-      m_itemsMovable = false;
-    }
-  }
-  KListView::startDrag();
-}
-
-/** Reimplementation to support the items dragEnter and dragLeave functions. */
-void CMainIndex::contentsDragMoveEvent( QDragMoveEvent* event ){
-//  qWarning("void CMainIndex:: drag move event ( QDragLeaveEvent* e )");
-  if ( CItemBase* i = dynamic_cast<CItemBase*>( itemAt( contentsToViewport(event->pos())) )) {
-  	if (i->allowAutoOpen(event) || (i->acceptDrop(event) && i->isFolder() && i->allowAutoOpen(event) && !i->isOpen() && autoOpen()) ) {
-//       qWarning("autoopen: %s", i->text(0).latin1());
-      if (m_autoOpenFolder != i)  {
-        m_autoOpenTimer.stop();
-      }
-      m_autoOpenFolder = i;
-      m_autoOpenTimer.start( 400, true );
-    }
-    else {
-      m_autoOpenFolder = 0;
-    }
-  }
-  else {
-    m_autoOpenFolder = 0;
-  }
-  
-  KListView::contentsDragMoveEvent(event);
-}
-
-void CMainIndex::autoOpenTimeout(){
-  m_autoOpenTimer.stop();
-  if (m_autoOpenFolder && !m_autoOpenFolder->isOpen() && m_autoOpenFolder->childCount()) {
-    m_autoOpenFolder->setOpen(true);
-  }
-}
-
-/** No descriptions */
-void CMainIndex::contentsDragLeaveEvent( QDragLeaveEvent* e ){
-//  qWarning("void CMainIndex::contentsDragLeaveEvent( QDragLeaveEvent* e )");
-  m_autoOpenTimer.stop();
-  KListView::contentsDragLeaveEvent(e);
-}
-
-/** Returns true if more than one netry is supported by this action type. Returns false for actions which support only one entry, e.g. about module etc. */
-const bool CMainIndex::isMultiAction( const CItemBase::MenuAction type ) const {
-  switch (type) {
-    case CItemBase::NewFolder:
-      return false;
-    case CItemBase::ChangeFolder:
-      return false;
-
-    case CItemBase::ChangeBookmark:
-      return false;
-    case CItemBase::ImportBookmarks:
-      return false;
-    case CItemBase::ExportBookmarks:
-      return false;
-    case CItemBase::PrintBookmarks:
-      return true;
-
-    case CItemBase::DeleteEntries:
-      return true;
-
-    case CItemBase::EditModule:
-      return false;
-    case CItemBase::SearchInModules:
-      return true;
-    case CItemBase::UnlockModule:
-      return false;
-    case CItemBase::AboutModule:
-      return false;
-  }
-  return false;
-}
-
-/** Is called when items should be moved. */
-void CMainIndex::moved( QPtrList<QListViewItem>& /*items*/, QPtrList<QListViewItem>& /*afterFirst*/, QPtrList<QListViewItem>& /*afterNow*/){
-}
-
-/** Opens an editor window to edit the modules content. */
-void CMainIndex::editModulePlain(){
-  QPtrList<QListViewItem> items = selectedItems();
-  ListCSwordModuleInfo modules;
-  for (items.first(); items.current(); items.next()) {
-    if (CModuleItem* i = dynamic_cast<CModuleItem*>(items.current())) {
-      modules.append(i->module());
-    }
-  }
-  if (modules.count() == 1) {
-    emit createWriteDisplayWindow(modules.first(), QString::null, CDisplayWindow::PlainTextWindow);
-  };
-}
-
-/** Opens an editor window to edit the modules content. */
-void CMainIndex::editModuleHTML(){
-  QPtrList<QListViewItem> items = selectedItems();
-  ListCSwordModuleInfo modules;
-  for (items.first(); items.current(); items.next()) {
-    if (CModuleItem* i = dynamic_cast<CModuleItem*>(items.current())) {
-      modules.append(i->module());
-    }
-  }
-  if (modules.count() == 1) {
-    emit createWriteDisplayWindow(modules.first(), QString::null, CDisplayWindow::HTMLWindow);
-  };
-}
-
-/** Reloads the main index's Sword dependend things like modules */
-void CMainIndex::reloadSword(){
-  //reload the modules
-//  saveBookmarks();
-  clear();
-  initTree();  
-}
-
-/** Saves the bookmarks to disk */
-void CMainIndex::saveBookmarks(){
-  //find the bookmark folder
-//  qWarning("void CMainIndex::saveBookmarks(){");
-  CItemBase* i = 0;
-  QListViewItemIterator it( this );
-  while ( it.current() != 0 ) {
-    i = dynamic_cast<CItemBase*>( it.current() );
-    if (i && i->type() == CItemBase::BookmarkFolder) { //found the bookmark folder
-      KStandardDirs stdDirs;
-    	const QString path = stdDirs.saveLocation("data", "bibletime/");
-      if (!path.isEmpty()) {
-        //save the bookmarks to the right file
-        if (CBookmarkFolder* f = dynamic_cast<CBookmarkFolder*>(i)) {
-          f->saveBookmarks( path + "bookmarks.xml" );
-        }
-      }
-      break;
-    }
-    ++it;
-  }
-}
diff --git a/bibletime/frontend/mainindex/cmainindex.h b/bibletime/frontend/mainindex/cmainindex.h
deleted file mode 100644
index 7a337a7..0000000
--- a/bibletime/frontend/mainindex/cmainindex.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/***************************************************************************
-                          cmainindex.h  -  description
-                             -------------------
-    begin                : Sam Jun 22 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CMAININDEX_H
-#define CMAININDEX_H
-
-//BibleTime includes
-#include "cindexitem.h"
-
-#include "backend/cswordmoduleinfo.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/ctooltip.h"
-
-#include "util/cpointers.h"
-
-//Qt includes
-#include <qwidget.h>
-#include <qtimer.h>
-
-//KDE includes
-#include <kaction.h>
-#include <klistview.h>
-
-/** The class which manages all bookmarks and modules. The modules are put into own, fixed subfolders sorted by language.
-  * @author The BibleTime team
-  */
-
-class CSearchDialog;
-
-class CMainIndex : public KListView {
-  Q_OBJECT
-	
-  class ToolTip : public CToolTip {
-	public:
-		ToolTip(QWidget* parent);
-		/**
-		* Displays a tooltip for position p using the getToolTip() function of CGroupManagerItem
-		*/		
-		virtual void maybeTip( const QPoint &pos);
-	};
-
-public:
-	CMainIndex(QWidget *parent);
-	virtual ~CMainIndex();
-  void initTree();
-  /**
-  * Opens the searchdialog using the given modules using the given search text.
-  */
-  void emitModulesChosen( ListCSwordModuleInfo modules, QString key );
-  /** Saves the bookmarks to disk */
-  void saveBookmarks();
-  /** Reloads the main index's Sword dependend things like modules */
-  void reloadSword();
-
-protected: // Protected methods
-  /**
-  * Reimplementation. Adds the given group to the tree.
-  */
-  virtual void addGroup( const CItemBase::Type type, const QString language);
-  /**
-  * Initialize the SIGNAL<->SLOT connections
-  */
-  void initConnections();
-  /**
-  * Reimplementation. Returns the drag object for the current selection.
-  */
-  virtual QDragObject* dragObject();
-  /**
-  * Reimplementation from KListView. Returns true if the drag is acceptable for the listview.
-  */
-  virtual bool acceptDrag( QDropEvent* event ) const;
-  /**
-  * Returns the correct KAction object for the given type of action.
-  */
-  KAction* const action( const CItemBase::MenuAction type ) const;
-  /**
-  * Reimplementation. Takes care of movable items.
-  */
-  virtual void startDrag();
-  /**
-  * Reimplementation to support the items dragEnter and dragLeave functions.
-  */
-  virtual void contentsDragMoveEvent( QDragMoveEvent* event );
-  virtual void contentsDragLeaveEvent( QDragLeaveEvent* e );
-
-public slots:
-  /**
-   * Opens the searchdialog for the selected modules.
-   */
-  void searchInModules();
-
-protected slots: // Protected slots
-  /**
-  * Is called when an item was clicked/double clicked.
-  */
-  void slotExecuted( QListViewItem* );
-  void dropped( QDropEvent*, QListViewItem*, QListViewItem*);
-  /**
-  * Shows the context menu at the given position.
-  */
-  void contextMenu(KListView*, QListViewItem*, const QPoint&);
-  /**
-  * Adds a new subfolder to the current item.
-  */
-  void createNewFolder();
-  /**
-  * Opens a dialog to change the current folder.
-  */
-  void changeFolder();
-  /**
-  * Exports the bookmarks being in the selected folder.
-  */
-  void exportBookmarks();
-  /**
-  * Changes the current bookmark.
-  */
-  void changeBookmark();
-  /**
-  * Import bookmarks from a file and add them to the selected folder.
-  */
-  void importBookmarks();  
-  /**
-  * Deletes the selected entries.
-  */
-  void deleteEntries();
-  /**
-  * Prints the selected bookmarks.
-  */
-  void printBookmarks();
-  /**
-  * Shows information about the current module.
-  */
-  void aboutModule();
-  /**
-  * Unlocks the current module.
-  */
-  void unlockModule();
-  void autoOpenTimeout();
-  /**
-  * Is called when items should be moved.
-  */
-  void moved( QPtrList<QListViewItem>& items, QPtrList<QListViewItem>& afterFirst, QPtrList<QListViewItem>& afterNow);
-  /**
-  * Opens a plain text editor window to edit the modules content.
-  */
-  void editModulePlain();
-  /**
-  * Opens an HTML editor window to edit the modules content.
-  */
-  void editModuleHTML();
-
-private: // Private methods
-  CSearchDialog* m_searchDialog;
-  ToolTip* m_toolTip;
-  bool m_itemsMovable;
-  QListViewItem* m_autoOpenFolder;
-  QTimer m_autoOpenTimer;
-
-  /**
-  * Initializes the view.
-  */
-  void initView();
-  /**
-  * Returns true if more than one netry is supported by this action type.
-  * Returns false for actions which support only one entry, e.g. about module etc.
-  */
-  const bool isMultiAction( const CItemBase::MenuAction type ) const;
-
-  struct Actions {
-    KAction* newFolder;
-    KAction* changeFolder;
-
-    KAction* changeBookmark;
-    KAction* importBookmarks;
-    KAction* exportBookmarks;
-    KAction* printBookmarks;
-
-    KAction* deleteEntries;
-
-    KActionMenu* editModuleMenu;
-    KAction* editModulePlain;
-    KAction* editModuleHTML;
-    
-    KAction* searchInModules;
-    KAction* unlockModule;
-    KAction* aboutModule;
-  } m_actions;
-  KPopupMenu* m_popup;
-
-signals: // Signals
-  /**
-  * Is emitted when a module should be opened,
-  */
-  void createReadDisplayWindow( ListCSwordModuleInfo, const QString& );
-  void createWriteDisplayWindow( CSwordModuleInfo*, const QString&, const CDisplayWindow::WriteWindowType& );  
-};
-
-#endif
diff --git a/bibletime/frontend/searchdialog/Makefile.am b/bibletime/frontend/searchdialog/Makefile.am
deleted file mode 100644
index 24541be..0000000
--- a/bibletime/frontend/searchdialog/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDES = $(all_includes)
-
-libsearchdialog_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libsearchdialog.a
-
-libsearchdialog_a_SOURCES = \
-csearchdialog.cpp \
-csearchdialogpages.cpp
-
-all_headers = \
-csearchdialog.h \
-csearchdialogpages.h
-
-EXTRA_DIST = $(libsearchdialog_a_SOURCES) $(all_headers)
-
diff --git a/bibletime/frontend/searchdialog/Makefile.in b/bibletime/frontend/searchdialog/Makefile.in
deleted file mode 100644
index 0def193..0000000
--- a/bibletime/frontend/searchdialog/Makefile.in
+++ /dev/null
@@ -1,696 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-
-#>- libsearchdialog_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libsearchdialog.a
-
-libsearchdialog_a_SOURCES = \
-csearchdialog.cpp \
-csearchdialogpages.cpp
-
-
-all_headers = \
-csearchdialog.h \
-csearchdialogpages.h
-
-
-EXTRA_DIST = $(libsearchdialog_a_SOURCES) $(all_headers)
-subdir = bibletime/frontend/searchdialog
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libsearchdialog_a_AR = $(AR) cru
-libsearchdialog_a_LIBADD =
-am_libsearchdialog_a_OBJECTS = csearchdialog.$(OBJEXT) \
-	csearchdialogpages.$(OBJEXT)
-#>- libsearchdialog_a_OBJECTS = $(am_libsearchdialog_a_OBJECTS)
-#>+ 6
-libsearchdialog_a_final_OBJECTS = libsearchdialog_a.all_cpp.o 
-libsearchdialog_a_nofinal_OBJECTS = csearchdialog.$(OBJEXT) \
-	csearchdialogpages.$(OBJEXT)\
-csearchdialogpages.moc.o csearchdialog.moc.o 
-@KDE_USE_FINAL_FALSE@libsearchdialog_a_OBJECTS = $(libsearchdialog_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libsearchdialog_a_OBJECTS = $(libsearchdialog_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/csearchdialog.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/csearchdialogpages.Po
-#>+ 4
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/csearchdialogpages.moc.P $(DEPDIR)/csearchdialog.moc.P  $(DEPDIR)/libsearchdialog_a.all_cpp.P ./$(DEPDIR)/csearchdialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/csearchdialogpages.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/csearchdialogpages.moc.P $(DEPDIR)/csearchdialog.moc.P ./$(DEPDIR)/csearchdialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/csearchdialogpages.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libsearchdialog_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libsearchdialog_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/frontend/searchdialog/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/searchdialog/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/searchdialog/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libsearchdialog.a: $(libsearchdialog_a_OBJECTS) $(libsearchdialog_a_DEPENDENCIES) 
-	-rm -f libsearchdialog.a
-	$(libsearchdialog_a_AR) libsearchdialog.a $(libsearchdialog_a_OBJECTS) $(libsearchdialog_a_LIBADD)
-	$(RANLIB) libsearchdialog.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csearchdialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/csearchdialogpages.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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:  $(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 "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-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
-
-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-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-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.
-.NOEXPORT:
-
-#>+ 3
-csearchdialogpages.moc.cpp: $(srcdir)/csearchdialogpages.h
-	$(MOC) $(srcdir)/csearchdialogpages.h -o csearchdialogpages.moc.cpp
-
-#>+ 2
-mocs: csearchdialogpages.moc.cpp
-
-#>+ 3
-csearchdialog.moc.cpp: $(srcdir)/csearchdialog.h
-	$(MOC) $(srcdir)/csearchdialog.h -o csearchdialog.moc.cpp
-
-#>+ 2
-mocs: csearchdialog.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  csearchdialogpages.moc.cpp csearchdialog.moc.cpp
-
-#>+ 2
-KDE_DIST=csearchdialog.h csearchdialogpages.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/frontend/searchdialog/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/frontend/searchdialog/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libsearchdialog_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/csearchdialog.cpp $(srcdir)/csearchdialogpages.cpp csearchdialogpages.moc.cpp csearchdialog.moc.cpp 
-	@echo 'creating libsearchdialog_a.all_cpp.cpp ...'; \
-	rm -f libsearchdialog_a.all_cpp.files libsearchdialog_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libsearchdialog_a.all_cpp.final; \
-	for file in csearchdialog.cpp csearchdialogpages.cpp csearchdialogpages.moc.cpp csearchdialog.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libsearchdialog_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libsearchdialog_a.all_cpp.final; \
-	done; \
-	cat libsearchdialog_a.all_cpp.final libsearchdialog_a.all_cpp.files > libsearchdialog_a.all_cpp.cpp; \
-	rm -f libsearchdialog_a.all_cpp.final libsearchdialog_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libsearchdialog_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libsearchdialog_a_OBJECTS="$(libsearchdialog_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/frontend/searchdialog/csearchdialog.cpp b/bibletime/frontend/searchdialog/csearchdialog.cpp
deleted file mode 100644
index 7be6b1a..0000000
--- a/bibletime/frontend/searchdialog/csearchdialog.cpp
+++ /dev/null
@@ -1,1248 +0,0 @@
-/***************************************************************************
-                          csearchdialog.cpp  -  description
-                             -------------------
-    begin                : Die Jul 30 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "csearchdialog.h"
-
-#include "backend/cswordkey.h"
-#include "backend/cswordversekey.h"
-
-#include "frontend/cbtconfig.h"
-
-#include "util/cresmgr.h"
-#include "util/ctoolclass.h"
-
-//Qt includes
-#include <qhbox.h>
-#include <qptrlist.h>
-#include <qpainter.h>
-#include <qwhatsthis.h>
-#include <qlayout.h>
-#include <qmap.h>
-#include <qlineedit.h>
-#include <qtextedit.h>
-#include <qlabel.h>
-#include <qsizepolicy.h>
-#include <qpushbutton.h>
-#include <qheader.h>
-#include <qregexp.h>
-
-//KDE includes
-#include <kapplication.h>
-#include <kfiledialog.h>
-#include <klocale.h>
-#include <kiconloader.h>
-
-const int SPACE_BETWEEN_PARTS = 5;
-const int RIGHT_BORDER = 15;
-const int LEFT_BORDER = 15;
-const int LOWER_BORDER = 10;
-const int UPPER_BORDER = 10;
-
-const int ITEM_TEXT_SIZE = 8;
-const int LABEL_TEXT_SIZE = 6;
-
-//used for the shift between the bars
-const int BAR_DELTAX = 4;
-const int BAR_DELTAY = 2;
-const int BAR_WIDTH  = 2 + (2*BAR_DELTAX);  //should be equal or bigger than the label font size
-// Used for the text below the bars
-const int BAR_LOWER_BORDER = 100;
-
-const int LEGEND_INNER_BORDER = 5;
-const int LEGEND_DELTAY = 4;
-const int LEGEND_WIDTH = 85;
-
-static CSearchDialog* m_staticDialog = 0;
-
-void CSearchDialog::openDialog(const ListCSwordModuleInfo modules, const QString& searchText, QWidget* parentDialog) {
-  if (!m_staticDialog) {
-    m_staticDialog = new CSearchDialog(parentDialog);
-  };
-  m_staticDialog->reset();
-
-  if (modules.count()) {
-    m_staticDialog->setModules(modules);
-  } else {
-    m_staticDialog->showModulesSelector();
-  }
-
-  m_staticDialog->setSearchText(searchText);
-  if (m_staticDialog->isHidden()) {
-    m_staticDialog->show();
-  }
-  
-  m_staticDialog->raise();
-  if (modules.count() && !searchText.isEmpty()) {
-    m_staticDialog->startSearch();
-  }
-};
-
-CSearchDialog* const CSearchDialog::getSearchDialog() {
-  Q_ASSERT(m_staticDialog);
-  return m_staticDialog;
-};
-
-CSearchDialog::CSearchDialog(QWidget *parent)
-  : KDialogBase(Tabbed, i18n("Search dialog"), Close | User1 | User2, User1, parent, "CSearchDialog", false, true, i18n("Search"), i18n("Interrupt")) {
-
-	setIcon(CResMgr::searchdialog::icon);
-	m_searcher.connectPercentUpdate(this, SLOT(percentUpdate()));
-	m_searcher.connectFinished(this, SLOT(searchFinished()));
-
-  initView();
-  initConnections();
-}
-
-CSearchDialog::~CSearchDialog(){
-}
-
-/** Reimplemented to show the First time searchdialog page. */
-void CSearchDialog::show(){
-  KDialogBase::show();
-
-//  if (CBTConfig::get(CBTConfig::firstSearchDialog)) { //is this the first time we show the dialog?
-//    CHTMLDialog dlg(CResMgr::helpDialog::firstTimeSearchDialog);
-//    dlg.exec();
-//    CBTConfig::set(CBTConfig::firstSearchDialog, false);
-//  };  
-}
-
-/** Starts the search with the set modules and the set search text. */
-void CSearchDialog::startSearch(){
-  QString searchText(m_searchOptionsPage->searchText());
-
-  if (searchText.isEmpty()) return;
-
-  m_searchResultPage->reset();
-  enableButton(User1,false);
-  enableButton(User2,true);
-  m_interruptedSearch = false;
-
-  int searchFlags = m_searchOptionsPage->searchFlags();	
-  m_searchOptionsPage->prepareSearch();
-
-  const CSwordModuleSearch::scopeType scopeType = m_searchOptionsPage->scopeType();
-  if (scopeType == CSwordModuleSearch::Scope_LastSearch) {
-    searchFlags |= CSwordModuleSearch::useLastResult;
-  } else if ( (scopeType == CSwordModuleSearch::Scope_Bounds) && strlen(m_searchOptionsPage->searchScope().getRangeText()) ) {
-    //we need the scope flag and a valid scope!
-    searchFlags |= CSwordModuleSearch::useScope;
-    m_searcher.setSearchScope( m_searchOptionsPage->searchScope() );
-  }  
-  
-  m_searcher.setModules( modules() );
-  m_searcher.setSearchedText(searchText);
-  m_searcher.setSearchOptions(searchFlags);
-
-//  qWarning("start the search");
-  m_searcher.startSearchThread();
-}
-
-/** Starts the search with the given module list and given search text. */
-void CSearchDialog::startSearch( const ListCSwordModuleInfo modules, const QString& searchText){
-  m_searchResultPage->reset();
-  m_searchOptionsPage->reset();
-  setModules(modules);
-  setSearchText(searchText);
-
-  startSearch();
-}
-
-/** Returns the list of used modules. */
-const ListCSwordModuleInfo CSearchDialog::modules(){
-  return m_searchOptionsPage->modules();
-}
-
-/** Sets the list of modules for the search. */
-void CSearchDialog::setModules( const ListCSwordModuleInfo modules ){
-  m_searchOptionsPage->setModules(modules);
-  resize( sizeHint() );
-}
-
-/** Returns the search text which is set currently. */
-const QString CSearchDialog::searchText(){
-  return m_searchOptionsPage->searchText();
-}
-
-sword::ListKey CSearchDialog::searchScope(){
-  return m_searchOptionsPage->searchScope();
-};
-
-/** Returns true if the search used a scope, otherwise false. */
-const CSwordModuleSearch::scopeType CSearchDialog::searchScopeType() const {
-  return m_searchOptionsPage->scopeType();
-}
-
-/** Returns true if the search used a scope, otherwise false. */
-const int CSearchDialog::searchFlags() const {
-  return m_searchOptionsPage->searchFlags();
-}
-  
-/** Returns the search text which is used for the search. */
-void CSearchDialog::setSearchText( const QString searchText ){
-  m_searchOptionsPage->setSearchText(searchText);
-}
-
-/** Initializes this object. */
-void CSearchDialog::initView(){
-  setButtonTip(User1, CResMgr::searchdialog::searchButton::tooltip);
-  setButtonWhatsThis(User1, CResMgr::searchdialog::searchButton::whatsthis);
-
-  setButtonTip(User2, CResMgr::searchdialog::cancelSearchButton::tooltip);
-  setButtonWhatsThis(User2, CResMgr::searchdialog::cancelSearchButton::whatsthis);
-
-  QHBox* box = addHBoxPage(i18n("Search options"));
-  m_index.optionsPage = pageIndex(box);
-  m_searchOptionsPage = new CSearchOptionsPage(box);
-  
-  box = addHBoxPage(i18n("Search result"));
-  m_index.resultPage = pageIndex(box);
-  m_searchResultPage = new CSearchResultPage(box);
-}
-
-/** Updates the percentage bars. */
-void CSearchDialog::percentUpdate(){
-  updateProgress();
-}
-
-/** Updates the percentage bars. */
-void CSearchDialog::searchFinished(){
-//  qWarning("CSearchDialog::searchFinished()");
- 	m_searchOptionsPage->setOverallProgress(100);
- 	m_searchOptionsPage->setCurrentModuleProgress(100);
-
- 	if ( !m_interruptedSearch && m_searcher.foundItems() ){
- 		m_searchResultPage->setSearchResult(modules());
-    showPage(m_index.resultPage);
- 	}
- 	else
- 		m_searchResultPage->reset();
-
- 	enableButton(User2,false);
- 	enableButton(User1,true); 	
-}
-
-void CSearchDialog::showModulesSelector() {
-  m_searchOptionsPage->chooseModules();
-}
-
-/** Initializes the signal slot connections */
-void CSearchDialog::initConnections(){
-  connect(this, SIGNAL(user1Clicked()), SLOT(startSearch()));
-  connect(this, SIGNAL(user2Clicked()), SLOT(interruptSearch()));
-  connect(this, SIGNAL(closeClicked()), SLOT(slotDelayedDestruct()));  
-  connect(this, SIGNAL(aboutToShowPage(QWidget*)), SLOT(slotShowPage(QWidget*)));
-}
-
-/** Updates the progress. */
-void CSearchDialog::updateProgress(){
-  KApplication::kApplication()->processEvents();
-  m_searchOptionsPage->setOverallProgress(m_searcher.getPercent(CSwordModuleSearch::allModules));
-  m_searchOptionsPage->setCurrentModuleProgress(m_searcher.getPercent(CSwordModuleSearch::currentModule));
-}
-
-/** Interrupts the search. */
-void CSearchDialog::interruptSearch(){
-  m_interruptedSearch = true;
-  m_searcher.interruptSearch();
-  m_searchOptionsPage->prepareSearch();
-}
-
-/** Resets the parts to the default. */
-void CSearchDialog::reset(){
-  m_searchOptionsPage->reset();
-  m_searchResultPage->reset();
-  showPage(m_index.optionsPage);
-}
-
-/** Is the slot which is called when a page will be shown. */
-void CSearchDialog::slotShowPage(QWidget* page){
-  if (pageIndex(page) == m_index.optionsPage) {
-    m_searchOptionsPage->aboutToShow();
-  };
-}
-
-/** Reimplementation. */
-void CSearchDialog::slotClose(){
-  //try to stop the search before we close the dialog which destroys the search object
-  m_interruptedSearch = true;
-  m_searcher.interruptSearch();
-
-  delayedDestruct();
-  m_staticDialog = 0;
-}
-
-/****************************/
-/****************************/
-/****************************/
-
-CModuleChooser::ModuleCheckBoxItem::ModuleCheckBoxItem(QListViewItem* item, CSwordModuleInfo* module) : QCheckListItem(item, QString::null, QCheckListItem::CheckBox) {
-  m_module = module;
-  setText(0,m_module->name());
-};
-
-CModuleChooser::ModuleCheckBoxItem::~ModuleCheckBoxItem() {
-
-};
-
-/** Returns the used module. */
-CSwordModuleInfo* const CModuleChooser::ModuleCheckBoxItem::module() const{
-  return m_module;
-}
-
-
-/****************************/
-/****************************/
-/****************************/
-
-CModuleChooser::CModuleChooser(QWidget* parent) : KListView(parent) {
-  initView();
-  initTree();
-};
-
-CModuleChooser::~CModuleChooser() {
-
-};
-
-void CModuleChooser::show() {
-  KListView::show();
-
-  //open module items
-  QListViewItemIterator it( this );
-  for ( ; it.current(); ++it ) {
-    if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) {
-      if (i->isOn()) {
-        ensureItemVisible(i);
-      };
-    }
-  }
-};
-
-/** Initializes this widget and the childs of it. */
-void CModuleChooser::initView(){
-  addColumn("Module Name");
-  setRootIsDecorated(true);
-//  header()->hide();
-  setFullWidth(true);
-}
-
-/** Initializes the tree of this widget. */
-void CModuleChooser::initTree(){
-  ListCSwordModuleInfo mods = backend()->moduleList();
-  /**
-  * The next steps:
-  * 1. Sort by type
-  * 2. Sort the modules of this type by their language
-  * 3. Create the subfolders for this
-  */
-
-  QMap<CSwordModuleInfo::ModuleType, QString> typenameMap;
-  typenameMap.insert(CSwordModuleInfo::Bible, i18n("Bibles"));
-  typenameMap.insert(CSwordModuleInfo::Commentary, i18n("Commentaries"));
-  typenameMap.insert(CSwordModuleInfo::Lexicon, i18n("Lexicons"));
-  typenameMap.insert(CSwordModuleInfo::GenericBook, i18n("Books"));
-
-  int type = CSwordModuleInfo::Bible;
-  bool ok = true;
-  bool addedDevotionals = false;
-  bool addedGlossaries = false;
-  bool addedLexs = false;
-  bool incType = false;
-
-  while (ok) {
-    ListCSwordModuleInfo modsForType;
-    QString typeFolderCaption = QString::null;
-    incType = false;  
-    if (static_cast<CSwordModuleInfo::ModuleType>(type) == CSwordModuleInfo::Lexicon) {
-      if (!addedLexs) {
-        for (mods.first(); mods.current(); mods.next()) {
-          if (mods.current()->type() == CSwordModuleInfo::Lexicon && (mods.current()->category() != CSwordModuleInfo::DailyDevotional) && (mods.current()->category() != CSwordModuleInfo::Glossary)) {
-            modsForType.append(mods.current());
-          };
-        };
-        addedLexs = true;
-        typeFolderCaption = QString::null;
-      }
-      else if (!addedDevotionals) {
-        for (mods.first(); mods.current(); mods.next()) {
-          if (mods.current()->category() == CSwordModuleInfo::DailyDevotional) {
-            modsForType.append(mods.current());
-          };
-        };
-        addedDevotionals = true;
-        typeFolderCaption = i18n("Daily Devotionals");
-      }
-      else if (!addedGlossaries) {
-        for (mods.first(); mods.current(); mods.next()) {
-          if (mods.current()->category() == CSwordModuleInfo::Glossary) {
-            modsForType.append(mods.current());
-          };
-        };
-        addedGlossaries = true;
-        typeFolderCaption = i18n("Glossaries");        
-      };
-
-      if (addedLexs && addedDevotionals && addedGlossaries)
-        incType = true;
-    }
-    else if (type == CSwordModuleInfo::Bible || type == CSwordModuleInfo::Commentary || type == CSwordModuleInfo::GenericBook){
-      for (mods.first(); mods.current(); mods.next()) {
-        if (mods.current()->type() == type) {
-          modsForType.append(mods.current());
-        };
-      };
-      incType = true;
-    }
-    else
-      ok = false;
-
-    if (typeFolderCaption.isEmpty()) {
-      typeFolderCaption = typenameMap[static_cast<CSwordModuleInfo::ModuleType>(type)];
-    }
-
-    //get the available languages of the selected modules
-    QStringList langs;
-    for (modsForType.first(); modsForType.current(); modsForType.next()) {
-      if ( !langs.contains(QString::fromLatin1( modsForType.current()->module()->Lang() ))) {
-        langs.append(QString::fromLatin1( modsForType.current()->module()->Lang() ));
-      }
-    };
-    langs.sort();
-
-    //go through the list of languages and create subfolders for each language and the modules of the language
-    QListViewItem* typeFolder = 0;
-    if (modsForType.count()) {
-      typeFolder = new QListViewItem(this, typeFolder, typeFolderCaption);
-    }
-    else {
-      if (incType) {
-        type++;
-      }
-      continue;
-    };
-
-    
-    QString language = QString::null;
-    CLanguageMgr* langMgr = languageMgr();
-    for ( QStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) {
-      language = langMgr->languageForAbbrev(*it).translatedName();
-      if (language.isEmpty()) {
-        language = (*it);
-      }
-      
-      QListViewItem* langFolder = new QListViewItem(typeFolder,language);
-      langFolder->setPixmap(0, SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-
-      //create the module items of this lang folder
-      for (modsForType.first(); modsForType.current(); modsForType.next()) {
-        if (QString::fromLatin1( modsForType.current()->module()->Lang() ) == (*it) ) { //found correct language
-          ModuleCheckBoxItem* i = new ModuleCheckBoxItem(langFolder, modsForType.current());
-          i->setPixmap(0, CToolClass::getIconForModule(modsForType.current()));
-        };
-      };
-    };
-    typeFolder->setPixmap(0,SmallIcon(CResMgr::mainIndex::closedFolder::icon, 16));
-
-    if (incType) {
-      ++type;
-    }
-  };
-}
-
-/** Returns a list of selected modules. */
-ListCSwordModuleInfo CModuleChooser::modules(){
-  ListCSwordModuleInfo mods;
-  QListViewItemIterator it( this );
-  for ( ; it.current(); ++it ) {
-    if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) {
-      //add the module if the box is checked
-      if (i->isOn()) {
-        mods.append(i->module());
-      };
-    };
-  };
-
-  return mods;
-}
-
-/** Sets the list of modules and updates the state of the checkbox items. */
-void CModuleChooser::setModules( ListCSwordModuleInfo modules ){
-//  qWarning("CModuleChooser::setModules( ListCSwordModuleInfo modules )");
-  QListViewItemIterator it( this );
-  for ( ; it.current(); ++it ) {
-    if ( ModuleCheckBoxItem* i = dynamic_cast<ModuleCheckBoxItem*>(it.current()) ) {
-      i->setOn(modules.contains(i->module())); //set the status for the module checkbox item
-//      if (i->isOn()) { //if it's checked, show the item
-//        qWarning("show item!");
-//        ensureItemVisible(i);
-//      }
-    }
-  };
-}
-
-/****************************/
-
-CModuleChooserDialog::CModuleChooserDialog( QWidget* parentDialog, ListCSwordModuleInfo modules ) : KDialogBase(Plain, i18n("Choose modules"), Ok, Ok, parentDialog, "CModuleChooser", false, true) {
-  initView();
-  initConnections();
-
-  m_moduleChooser->setModules(modules);
-};
-
-CModuleChooserDialog::~CModuleChooserDialog() {
-
-};
-
-/** Initializes the view of this dialog */
-void CModuleChooserDialog::initView(){
-  setButtonOKText(i18n("Use chosen modules"));
-
-  QFrame* page = plainPage();
-  QHBoxLayout* layout = new QHBoxLayout(page);
-  m_moduleChooser = new CModuleChooser(page);
-  m_moduleChooser->setMinimumSize(320,400);
-  layout->addWidget(m_moduleChooser);
-}
-
-/** Initializes the connections of this dialog. */
-void CModuleChooserDialog::initConnections(){
-
-}
-
-/** Reimplementation to handle the modules. */
-void CModuleChooserDialog::slotOk(){
-  emit modulesChanged( m_moduleChooser->modules() );
-
-  KDialogBase::slotOk();
-}
-
-/****************************/
-CRangeChooserDialog::RangeItem::RangeItem(QListView* view, QListViewItem* afterThis, const QString caption, const QString range) : KListViewItem(view, afterThis) {
-  setCaption(caption);
-  setRange(range);
-};
-
-CRangeChooserDialog::RangeItem::~RangeItem() {
-
-};
-
-const QString& CRangeChooserDialog::RangeItem::range() {
-//  qWarning("ange is %s", (const char*)m_range.utf8());
-  return m_range;
-};
-
-void CRangeChooserDialog::RangeItem::setRange(QString newRange) {
-  m_range = newRange;
-};
-
-const QString CRangeChooserDialog::RangeItem::caption() {
-  return text(0);
-};
-
-void CRangeChooserDialog::RangeItem::setCaption(const QString newCaption) {
-  setText(0, newCaption);
-};
-
-
-/**************************/
-CRangeChooserDialog::CRangeChooserDialog( QWidget* parentDialog ) : KDialogBase(Plain, i18n("Search range editor"), Default | Ok | Cancel, Ok, parentDialog, "CRangeChooserDialog", false, true) {
-  initView();
-  initConnections();
-  
-  //add the existing scopes
-  CBTConfig::StringMap map = CBTConfig::get(CBTConfig::searchScopes);
-  CBTConfig::StringMap::Iterator it;
-  for (it = map.begin(); it != map.end(); ++it) {
-    new RangeItem(m_rangeList, 0, it.key(), it.data());
-  };
-
-  editRange(0);
-  if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())){
-    nameChanged(i->caption());
-  }
-};
-
-CRangeChooserDialog::~CRangeChooserDialog() {
-};
-
-/** Initializes the view of this object. */
-void CRangeChooserDialog::initView(){
-//  setButtonOKText(i18n(""));
-  
-  QGridLayout* grid = new QGridLayout(plainPage(),6,5,0,3);
-
-  m_rangeList = new KListView(plainPage());
-  m_rangeList->addColumn(i18n("Search range"));
-  m_rangeList->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding));
-  m_rangeList->setFullWidth(true);
-  m_rangeList->setSorting(0, true);
-  m_rangeList->header()->setClickEnabled(false);
-  m_rangeList->header()->setMovingEnabled(false);
-  grid->addMultiCellWidget(m_rangeList,0,4,0,1);
-
-  m_newRangeButton = new QPushButton(i18n("Add new range"),plainPage());
-  connect(m_newRangeButton, SIGNAL(clicked()), this, SLOT(addNewRange()));
-  grid->addWidget(m_newRangeButton,5,0);
-
-  m_deleteRangeButton = new QPushButton(i18n("Delete current range"),plainPage());
-  connect(m_deleteRangeButton, SIGNAL(clicked()), this, SLOT(deleteCurrentRange()));
-  grid->addWidget(m_deleteRangeButton,5,1);
-    
-  grid->addColSpacing(2, 5);
-  
-  QLabel* label = new QLabel(i18n("Name:"), plainPage());
-  m_nameEdit = new QLineEdit(plainPage());
-  grid->addWidget(label,0,3);
-  grid->addWidget(m_nameEdit,0,4);
-
-  label = new QLabel(i18n("Edit current search range:"), plainPage());
-  label->setFixedSize(label->sizeHint());
-  m_rangeEdit = new QTextEdit(plainPage());
-  m_rangeEdit->setTextFormat(Qt::PlainText);
-  grid->addMultiCellWidget(label,1,1,3,4);
-  grid->addMultiCellWidget(m_rangeEdit,2,2,3,4);
-
-  grid->addRowSpacing(3, 10);
-  
-  m_resultList = new KListView(plainPage());
-  m_resultList->addColumn(i18n("Parsed search range:"));
-  m_resultList->setFullWidth(true);
-  m_resultList->setSorting(-1);
-  m_resultList->setShowSortIndicator(false);  
-  m_resultList->header()->setClickEnabled(false);
-  m_resultList->header()->setMovingEnabled(false);
-  m_resultList->setSelectionModeExt(KListView::NoSelection);
-  
-  grid->addMultiCellWidget(m_resultList, 4,5,3,4);
-
-  grid->setRowStretch(4,5);
-}
-
-/** Initializes the connections of this widget. */
-void CRangeChooserDialog::initConnections(){
-  connect(m_rangeList, SIGNAL(selectionChanged(QListViewItem*)),
-    this, SLOT(editRange(QListViewItem*)));
-
-  connect(m_rangeEdit, SIGNAL(textChanged()),
-    this, SLOT(parseRange()));
-  connect(m_rangeEdit, SIGNAL(textChanged()),
-    this, SLOT(rangeChanged()));
-
-  connect(m_nameEdit, SIGNAL(textChanged(const QString&)),
-    this, SLOT(nameChanged(const QString&)));
-}
-
-/** Adds a new range to the list. */
-void CRangeChooserDialog::addNewRange(){
-  RangeItem* i = new RangeItem(m_rangeList, m_rangeList->lastItem(), i18n("New range"));
-  m_rangeList->setSelected(i, true);
-  m_rangeList->setCurrentItem(i);  
-  editRange(i);
-
-  m_nameEdit->setFocus();
-}
-
-/** No descriptions */
-void CRangeChooserDialog::editRange(QListViewItem* item){
-  RangeItem* const range = dynamic_cast<RangeItem*>(item);
-  
-  m_nameEdit->setEnabled( range ); //only if an item is selected enable the edit part
-  m_rangeEdit->setEnabled( range );
-  m_resultList->setEnabled( range );
-  m_deleteRangeButton->setEnabled( range );
-  
-  if (range) {
-    m_nameEdit->setText(range->caption());
-//    qWarning("setting new range %s", (const char*)range->range().utf8());
-    m_rangeEdit->setText(range->range());
-//    qWarning("after setting new range is %s", (const char*)m_rangeEdit->text().utf8());
-  }
-}
-
-/** Parses the entered text and prints out the result in the list box below the edit area. */
-void CRangeChooserDialog::parseRange(){
-  m_resultList->clear();
-
-  //hack: repair range to  work with Sword 1.5.6
-  QString range( m_rangeEdit->text() );
-  range.replace(QRegExp("\\s{0,}-\\s{0,}"), "-" );
-  
-  sword::VerseKey key;
-  sword::ListKey verses = key.ParseVerseList((const char*)range.local8Bit(), "Genesis 1:1", true);
-	for (int i = 0; i < verses.Count(); ++i) {
-    new KListViewItem(m_resultList, QString::fromLocal8Bit(verses.GetElement(i)->getRangeText()));
-//    qWarning("range=%s, text=%s",verses.GetElement(i)->getRangeText(), verses.GetElement(i)->getText() );
-	}
-
-}
-
-/** No descriptions */
-void CRangeChooserDialog::rangeChanged(){
-  if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())) {
-    QString range( m_rangeEdit->text() );
-    //hack: repair range to work with Sword 1.5.6
-    range.replace(QRegExp("\\s{0,}-\\s{0,}"), "-" );
-    i->setRange(range);
-  };
-}
-
-/** No descriptions */
-void CRangeChooserDialog::nameChanged(const QString& newCaption){
-  m_rangeEdit->setEnabled(!newCaption.isEmpty());
-  m_resultList->setEnabled(!newCaption.isEmpty());
-  m_resultList->header()->setEnabled(!newCaption.isEmpty());  
-
-  if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())) {
-    if (!newCaption.isEmpty()) {
-        m_newRangeButton->setEnabled(true);
-        i->setCaption(newCaption);        
-        m_rangeList->sort();
-    }
-    else { //invalid name
-      i->setCaption(i18n("<invalid name of search range>"));
-      m_newRangeButton->setEnabled(false);
-    };
-  };
-}
-
-/** Deletes the selected range. */
-void CRangeChooserDialog::deleteCurrentRange(){
-  if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())) {
-    if (QListViewItem* selection = i->itemBelow() ? i->itemBelow() : i->itemAbove()) {
-      m_rangeList->setSelected(selection, true);
-      m_rangeList->setCurrentItem(selection);
-    }
-    else {
-      m_rangeList->setSelected(m_rangeList->firstChild(), true);
-      m_rangeList->setCurrentItem(m_rangeList->firstChild());      
-    }
-    delete i;
-  }
-  editRange(m_rangeList->currentItem()); 
-}
-
-void CRangeChooserDialog::slotOk(){
-  //save the new map of search scopes
-  CBTConfig::StringMap map;
-  QListViewItemIterator it( m_rangeList );
-  for (;it.current(); ++it) {
-    if ( RangeItem* i = dynamic_cast<RangeItem*>(it.current()) ){
-      map[i->caption()] = i->range();
-    };
-  };
-  CBTConfig::set(CBTConfig::searchScopes, map);
-
-  KDialogBase::slotOk();
-}
-  
-void CRangeChooserDialog::slotDefault(){
-  m_rangeList->clear();
-  CBTConfig::StringMap map = CBTConfig::getDefault(CBTConfig::searchScopes);
-  CBTConfig::StringMap::Iterator it;
-  for (it = map.begin(); it != map.end(); ++it) {
-    new RangeItem(m_rangeList, 0, it.key(), it.data());
-  };
-  m_rangeList->setSelected(m_rangeList->selectedItem(), false);
-  m_rangeList->setCurrentItem(0);  
-  
-  editRange(0);
-  if (RangeItem* i = dynamic_cast<RangeItem*>(m_rangeList->currentItem())) {
-    nameChanged(i->caption());
-  }
-
-  KDialogBase::slotDefault();  
-}
-
-/****************************/
-
-CSearchAnalysisDialog::CSearchAnalysisDialog( ListCSwordModuleInfo modules, QWidget* parentDialog ) : KDialogBase(Plain, i18n("Search analysis"), Close, Close, parentDialog, 0, true){
-  initView();
-  initConnections();
-  m_analysis->reset();
-  m_analysis->analyse(modules);
-  showMaximized();  
-};
-
-CSearchAnalysisDialog::~CSearchAnalysisDialog() {
-
-};
-
-/** Initializes this dialog. */
-void CSearchAnalysisDialog::initView(){
-  QVBoxLayout* layout = new QVBoxLayout(plainPage(),0);
-
-  QPushButton* button = new QPushButton(plainPage(), "button");
-  button->setIconSet(SmallIconSet("filesave"));
-  button->setText(i18n("Save search analysis as HTML"));
-  button->setFixedSize(button->sizeHint());
-  layout->addWidget(button);
-  layout->addSpacing(10);
-
-  m_analysis = new CSearchAnalysis(plainPage());
-  m_analysisView = new CSearchAnalysisView(m_analysis, plainPage());
-  m_analysisView->show();
-  layout->addWidget(m_analysisView);
-
-  connect(button, SIGNAL(clicked()), m_analysis, SLOT(saveAsHTML()));  
-}
-
-/** Initializes the widgets SIGNAL and SLOT connections,. */
-void CSearchAnalysisDialog::initConnections(){
-}
-
-/****************************/
-/*  CSearchAnalysis         */
-/****************************/
-
-CSearchAnalysis::CSearchAnalysis(QObject *parent, const char *name )
-	: QCanvas(parent,name) {
-
-  m_scaleFactor = 0.0;
-  m_legend = 0;
-  setBackgroundColor(Qt::white);	
-  m_canvasItemList.resize(67);
-  m_canvasItemList.setAutoDelete(true);
-  resize(1,1);
-  connect(this, SIGNAL(resized()), SLOT(slotResized()));
-}
-
-CSearchAnalysis::~CSearchAnalysis(){
-}
-
-QDict<CSearchAnalysisItem>* CSearchAnalysis::getSearchAnalysisItemList(){
-  // Returns pointer to the search analysis items
-  return &m_canvasItemList;
-}
-
-/** Starts the analysis of the search result. This should be called only once because QCanvas handles the updates automatically. */
-void CSearchAnalysis::analyse(ListCSwordModuleInfo modules){
-  /**
-	* Steps of analysing our search result;
-	*	-Create the items for all available books ("Genesis" - "Revelation")
-	* -Iterate through all modules we analyse
-	*		-Go through all books of this module
-	*			-Find out how many times we found the book
-	*			-Set the count to the items which belongs to the book
-	*/
-  setModules(modules);
-
-	m_lastPosList.clear();		
-	const int numberOfModules = m_moduleList.count();
-	if (!numberOfModules)
-		return;	
-	m_legend = new CSearchAnalysisLegendItem(this, &m_moduleList);	
-	m_legend->setX(LEFT_BORDER);
-	m_legend->setY(UPPER_BORDER);
-	m_legend->setSize(LEGEND_WIDTH,
-	           LEGEND_INNER_BORDER*2 + ITEM_TEXT_SIZE*numberOfModules + LEGEND_DELTAY*(numberOfModules-1));
-  m_legend->show();	
-
-  int xPos = LEFT_BORDER + m_legend->width() + SPACE_BETWEEN_PARTS;			
-	int moduleIndex = 0;	
-	m_maxCount = 0;	
-	int count = 0;
-	CSwordVerseKey key(0);	
-	key.key("Genesis 1:1");	
-	
-	CSearchAnalysisItem* analysisItem = m_canvasItemList[key.book()];
-	bool ok = true;
-	while (ok && analysisItem) {
-		for (moduleIndex = 0,m_moduleList.first(); m_moduleList.current(); m_moduleList.next(),++moduleIndex) {
-			KApplication::kApplication()->processEvents(10);
-			if (!m_lastPosList.contains(m_moduleList.current()))
-				m_lastPosList.insert(m_moduleList.current(),0);
-			analysisItem->setCountForModule(moduleIndex, (count = getCount(key.book(),m_moduleList.current())));
-			m_maxCount = (count > m_maxCount) ? count : m_maxCount;
-		}
-		analysisItem->setX(xPos);
-		analysisItem->setY(UPPER_BORDER);
-		analysisItem->show();
-		
-		xPos += (int)analysisItem->width() + SPACE_BETWEEN_PARTS;
-		ok = key.next(CSwordVerseKey::UseBook);		
-   	analysisItem = m_canvasItemList[key.book()];
-	}
-	resize(xPos+BAR_WIDTH+(m_moduleList.count()-1)*BAR_DELTAX+RIGHT_BORDER, height() );	
-	slotResized();
-}
-
-/** Sets te module list used for the analysis. */
-void CSearchAnalysis::setModules(ListCSwordModuleInfo modules){
-	m_moduleList.clear();
-	for (modules.first(); modules.current(); modules.next()) {
-		if ( (modules.current()->type() == CSwordModuleInfo::Bible) || (modules.current()->type() == CSwordModuleInfo::Commentary) ) { //a Bible or an commentary
-			m_moduleList.append(modules.current());
-    }
-  }
-
-	m_canvasItemList.clear();
-	CSearchAnalysisItem* analysisItem = 0;	
-	CSwordVerseKey key(0);	
-	key.key("Genesis 1:1");
-	do {
-   	analysisItem = new CSearchAnalysisItem(this, m_moduleList.count(), key.book(), &m_scaleFactor, &m_moduleList);
-   	analysisItem->hide();
-		m_canvasItemList.insert(key.book(), analysisItem);
-	} while (key.next(CSwordVerseKey::UseBook));
-	update();
-}
-
-/** Sets back the items and deletes things to cleanup */
-void CSearchAnalysis::reset(){
-	m_scaleFactor = 0.0;
-  QDictIterator<CSearchAnalysisItem> it( m_canvasItemList ); // iterator for items
-	while ( it.current() ) {
-		it.current()->hide();
-		++it;
-	}	
-	m_lastPosList.clear();	
-	
-	if (m_legend)
-		m_legend->hide();
-	delete m_legend;
-	m_legend = 0;	
-	update();
-}
-
-/** No descriptions */
-void CSearchAnalysis::slotResized(){
-	m_scaleFactor = (double)( (double)(height()-UPPER_BORDER-LOWER_BORDER-BAR_LOWER_BORDER-(m_moduleList.count()-1)*BAR_DELTAY)
-	                                    /(double)m_maxCount);	
-	QDictIterator<CSearchAnalysisItem> it( m_canvasItemList );
-	while ( it.current() ) {
-		it.current()->setSize(BAR_WIDTH + (m_moduleList.count()-1)*BAR_DELTAX, height()-UPPER_BORDER-LOWER_BORDER);
-		it.current()->setY(UPPER_BORDER);
-  	++it;
-	}
-	update();
-}
-
-/** This function returns a color for each module */
-QColor CSearchAnalysis::getColor(int index){
-  switch (index){
-    case  0: return Qt::red;
-    case 	1: return Qt::darkGreen;
-    case  2: return Qt::blue;
-    case  3: return Qt::cyan;
-    case  4: return Qt::magenta;
-    case  5: return Qt::darkRed;
-    case  6: return Qt::darkGray;
-    case  7: return Qt::black;
-    case  8: return Qt::darkCyan;
-    case  9: return Qt::darkMagenta;
-    default: return Qt::red;
-  }
-}
-
-/** Returns the count of the book in the module */
-const unsigned int CSearchAnalysis::getCount( const QString book, CSwordModuleInfo* module ){
-	sword::ListKey& result = module->searchResult();
-	const int length = book.length();	
-	unsigned int i = m_lastPosList[module];
-	unsigned int count = 0;
-	const unsigned int resultCount = result.Count();
-	while (i < resultCount) {
-		if ( strncmp(book.local8Bit(), (const char*)*result.GetElement(i), length) )		
-			break;
-		i++;
-		++count;		
-	}
-	m_lastPosList.contains(module) ? m_lastPosList.replace(module,i) : m_lastPosList.insert(module,i);
-
-  return count;
-}
-
-
-//------------------------------------------------------------------
-//------------------------------------------------------------------
-
-CSearchAnalysisItem::CSearchAnalysisItem(QCanvas *parent, const int moduleCount, const QString &bookname, double *scaleFactor, ListCSwordModuleInfo* modules)
-	: QCanvasRectangle(parent),
-	m_moduleList( modules ),
-	m_scaleFactor(scaleFactor),
-	m_bookName(bookname),
-	m_moduleCount(moduleCount), 	
-	m_bufferPixmap(0)
-{	
- 	m_resultCountArray.resize(m_moduleCount);
- 	int index = 0;
- 	for (index = 0; index < m_moduleCount; ++index)
- 		m_resultCountArray[index] = 0;
-}
-
-CSearchAnalysisItem::~CSearchAnalysisItem() {
-  delete m_bufferPixmap;
-}
-
-/** Sets the resultcount of this item for the given module */
-void CSearchAnalysisItem::setCountForModule( const int moduleIndex, const int count) {
-	m_resultCountArray[moduleIndex] = count;
-}
-
-/** Returns the resultcount of this item for the given module */
-int CSearchAnalysisItem::getCountForModule( const int moduleIndex) {
-	return m_resultCountArray[moduleIndex];
-}
-
-/** Reimplementation. Draws the content of this item. */
-void CSearchAnalysisItem::draw(QPainter& painter) {
-	QFont f = painter.font();
-	f.setPointSize(ITEM_TEXT_SIZE);
-	painter.setFont(f);
-	
-	setPen(QPen(black,1));
-	setBrush(Qt::red);
-  /**	
-	* We have to paint so many bars as we have modules available (we use m_moduleCount)
-	* We paint inside the area which is given by height and width of this rectangle item
-	*/	
-	int index = 0;	
-	int drawn = 0;
-	int Value = 0;
-	
-	//find out the biggest value
-	for (index=0;index < m_moduleCount; index++) {
-	  if (m_resultCountArray[index] > Value) {
-	    Value = m_resultCountArray[index];
-    } 
-  };
-	
-	while (drawn < m_moduleCount) {
-    for (index = 0; index < m_moduleCount; index++) {
-      if (m_resultCountArray[index] == Value) {
-    		QPoint p1((int)x() + (m_moduleCount-drawn-1)*BAR_DELTAX,
-    		          (int)height() + (int)y() - BAR_LOWER_BORDER - (m_moduleCount-drawn)*BAR_DELTAY);
-    		QPoint p2(p1.x() + BAR_WIDTH,
-    		          p1.y() - (int)( !m_resultCountArray[index] ? 0 : ((m_resultCountArray[index])*(*m_scaleFactor))) );
-    		QRect r(p1, p2);
-    		painter.fillRect(r, QBrush(CSearchAnalysis::getColor(index)) );
-    		painter.drawRect(r);
-    		drawn++;
-      }
-    }
-    //finds the next smaller value
- 	  int newValue = 0;
- 		for (index=0;index < m_moduleCount; index++)
-   	  if (m_resultCountArray[index] < Value && m_resultCountArray[index] >= newValue)
-   	    newValue = m_resultCountArray[index];
-   	Value = newValue;
-	}		
-	if (!m_bufferPixmap) {
-		m_bufferPixmap = new QPixmap();
-		m_bufferPixmap->resize(width(),BAR_LOWER_BORDER);
-		m_bufferPixmap->fill();		
-		QPainter p(m_bufferPixmap);				
-		f = p.font();
-		f.setPointSize(ITEM_TEXT_SIZE);
-		p.setFont(f);		
-		p.rotate(90);
-		p.drawText(QPoint(5,0), m_bookName);
-	}
-	painter.drawPixmap(QPoint(int(x()),int(height()+y()-BAR_LOWER_BORDER)), *m_bufferPixmap);
-}
-
-/** Returns the width of this item. */
-int CSearchAnalysisItem::width(){
-	return m_moduleCount*(m_moduleCount>1 ? BAR_DELTAX : 0) + BAR_WIDTH;	
-}
-
-/** Returns the tooltip for this item. */
-const QString CSearchAnalysisItem::getToolTip(){
-	QString ret = QString::fromLatin1("<CENTER><B>%1</B></CENTER><HR>").arg(m_bookName);
-	ret += "<TABLE CELLSPACING=\"0\" CELLPADDING=\"3\" WIDTH=\"100%\" HEIGHT=\"100%\" ALIGN=\"center\">";
-	for (int i = 0; i < m_moduleCount; ++i) {
-		CSwordModuleInfo* info = m_moduleList->at(i);
-		const QColor c = CSearchAnalysis::getColor(i);
-		ret.append(
-			QString::fromLatin1("<TR BGCOLOR=\"white\"><TD><B><FONT COLOR=\"#%1\">%2</FONT></B></TD><TD>%3 (%4%)</TD></TR>")
-				.arg(QString().sprintf("%02X%02X%02X",c.red(),c.green(),c.blue()))
-				.arg(info ? info->name() : QString::null)
-				.arg(m_resultCountArray[i])
-        .arg((info && m_resultCountArray[i])? ((double)m_resultCountArray[i] / (double)info->searchResult().Count())*(double)100 : 0.0, 0, 'g', 2)
-		);
-	}
-	ret += "</TABLE>";
-	return ret;
-}
-
-//------------------------------------------------------------------
-//------------------------------------------------------------------
-
-CSearchAnalysisView::CSearchAnalysisView(QCanvas* canvas, QWidget* parent)
-	: QCanvasView(canvas, parent) {
-//	QWhatsThis::add(this, WT_SD_ANALYSIS_VIEW);
-	setFocusPolicy(QWidget::WheelFocus);
-	m_toolTip = new ToolTip(this);	
-	resize(sizeHint());
-
-}
-
-/** Returns the sizeHint for this view */
-QSize CSearchAnalysisView::sizeHint(){
-	if ( parentWidget() )
-		return parentWidget()->sizeHint();
-	return QCanvasView::sizeHint();
-}
-
-/** No descriptions */
-void CSearchAnalysisView::resizeEvent( QResizeEvent* e){
-	QCanvasView::resizeEvent(e);
-	canvas()->resize( canvas()->width(), viewport()->height() );
-}
-
-CSearchAnalysisView::ToolTip::ToolTip(QWidget* parent) : QToolTip(parent) {
-}
-
-void CSearchAnalysisView::ToolTip::maybeTip(const QPoint& p) {
-	CSearchAnalysisView* view = dynamic_cast<CSearchAnalysisView*>(parentWidget());
-	if (!view)
-		return;
-	QPoint point(p);
-	point = view->viewport()->mapFrom(view, point);
-	CSearchAnalysisItem* i = view->itemAt( view->viewportToContents(point) );
-	if (!i)
-		return;
-				
-	//get type of item and display correct text
-	QString text = i->getToolTip();
-	if (text.isEmpty())
-		return;
-	
-	QPoint p1 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().topLeft()));
-	p1.setY(0);	
-	QPoint p2 = view->viewport()->mapTo(view, view->contentsToViewport(i->rect().bottomRight()));
-	p2.setY(view->height());	
-	QRect r = QRect( p1, p2 );	
-	if (r.contains(p))
-		tip(r, text);
-}
-
-
-/** Returns the item at position p. If there no item at that point return 0. */
-CSearchAnalysisItem* CSearchAnalysisView::itemAt( const QPoint& p ){
-	QCanvasItemList l = canvas()->collisions(p);
-	if (!l.count())
-		return 0;
-	return dynamic_cast<CSearchAnalysisItem*>(l.first());	
-}
-
-//------------------------------------------------------------------
-//------------------------------------------------------------------
-
-CSearchAnalysisLegendItem::CSearchAnalysisLegendItem(QCanvas *parent, ListCSwordModuleInfo *list )
-	: QCanvasRectangle(parent) {
-	m_moduleList = list;
-}
-
-/** Reimplementation. Draws the content of this item. */
-void CSearchAnalysisLegendItem::draw (QPainter& painter) {	
- 	painter.save();
- 		
-	setPen( QPen(black,2) );
-	setBrush( Qt::white );
-  //the outer rectangle
-  QPoint p1( (int)x(), (int)y() );
-  QPoint p2( (int)x()+width(), (int)y() + height() );
-  QRect r(p1, p2);
-  r.normalize();
- 	painter.drawRect(r);
- 	
-  QFont f = painter.font();
-  f.setPointSize(ITEM_TEXT_SIZE);
-  painter.setFont(f);
- 	
- 	for (unsigned int index=0; index < m_moduleList->count(); index++){
- 	  // the module color indicators
- 	  QPoint p1( (int)x() + LEGEND_INNER_BORDER, (int)y() + LEGEND_INNER_BORDER + index*(LEGEND_DELTAY + ITEM_TEXT_SIZE) );
- 	  QPoint p2(p1.x() + ITEM_TEXT_SIZE, p1.y() + ITEM_TEXT_SIZE);
- 	  QRect r(p1,p2);
- 		painter.fillRect(r, QBrush(CSearchAnalysis::getColor(index)) );
- 		r.normalize();
- 		painter.drawRect(r);
- 		
- 		QPoint p3( p2.x() + LEGEND_INNER_BORDER, p2.y() );
-  	painter.drawText(p3, m_moduleList->at(index)->name() );
- 	}
-  painter.restore();
-}
-
-/** No descriptions */
-void CSearchAnalysis::saveAsHTML(){
- 	const QString file = KFileDialog::getSaveFileName(QString::null, QString::fromLatin1("*.html | %1").arg(i18n("HTML files")), 0, i18n("Save Search Analysis"));
-	if (file.isNull()) {
-    return;
-  }
-
- 	int moduleIndex = 0;
- 	int count = 0;
- 	QString countStr = "";
- 	QString m_searchAnalysisHTML = "";
- 	QString tableTitle = "";
-  QString tableTotals = "";
- 	QString VerseRange = "";
- 	const QString txtCSS = QString::fromLatin1("<style type=\"text/css\">\ntd {border:1px solid black;}\nth {font-size: 130%; text-align:left; vertical-align:top;}\n</style>\n");
-	const QString metaEncoding = QString::fromLatin1("<META http-equiv=Content-Type content=\"text/html; charset=utf-8\">");
- 	CSwordVerseKey key(0);
- 	sword::ListKey searchResult;
-
- 	key.key("Genesis 1:1");
-
- 	if (CSearchDialog::getSearchDialog()->searchScopeType() != CSwordModuleSearch::Scope_NoScope) { //a search scope was used
- 		sword::ListKey verses = CSearchDialog::getSearchDialog()->searchScope();
- 		for (int i = 0; i < verses.Count(); ++i) {
-      VerseRange += QString::fromLocal8Bit(verses.GetElement(i)->getRangeText()) + "<BR>";
- 		}
- 	}
-
- 	CSearchAnalysisItem* analysisItem = m_canvasItemList.find( key.book() );
-
-  QString text = "<html>\n<head>\n<title>" + i18n("BibleTime Search Analysis") + "</title>\n" + txtCSS + metaEncoding + "</head>\n<body>\n";
- 	text += "<table>\n<tr><th>" + i18n("Search text :") + "</th><th>" + CSearchDialog::getSearchDialog()->searchText() + "</th></tr>\n";
- 	text += QString::fromLatin1("<tr><th>") + i18n("Search type :") + QString::fromLatin1("</th><th>") + /*m_searchText->getSearchTypeString() +*/ "</th></tr>\n";
- 	text += QString::fromLatin1("<tr><th>") + i18n("Search scope:") + "</th><th>" + ((CSearchDialog::getSearchDialog()->searchScopeType() !=  CSwordModuleSearch::Scope_NoScope) ? VerseRange : i18n("No search scope")) + "</th></tr>\n</table>\n<br>\n";
-
-
-  tableTitle = "<tr><th align=\"left\">" + i18n("Book") + "</th>";
- 	tableTotals = "<tr><td align=\"left\">" + i18n("Total hits") + "</td>";
- 	for (moduleIndex = 0,m_moduleList.first(); m_moduleList.current(); m_moduleList.next(),++moduleIndex) {
- 			tableTitle += QString::fromLatin1("<th align=\"left\">") + m_moduleList.current()->name() + QString::fromLatin1("</th>");
- 			searchResult = m_moduleList.current()->searchResult();
- 			countStr.setNum(searchResult.Count());
-      tableTotals += QString::fromLatin1("<td align=\"right\">") + countStr + QString::fromLatin1("</td>");
- 	}
- 	tableTitle += QString::fromLatin1("</tr>\n");
- 	tableTotals += QString::fromLatin1("</tr>\n");
-
- 	m_searchAnalysisHTML = "";
- 	bool ok = true;
- 	while (ok) {
- 		m_searchAnalysisHTML += QString::fromLatin1("<tr><td>") + key.book() + QString::fromLatin1("</td>");
- 		analysisItem = m_canvasItemList.find( key.book() );
- 		for (moduleIndex = 0, m_moduleList.first(); m_moduleList.current(); m_moduleList.next(), ++moduleIndex) {
- 			count = analysisItem->getCountForModule(moduleIndex);
- 			countStr.setNum(count);
- 			m_searchAnalysisHTML += QString::fromLatin1("<td align=\"right\">") + countStr + QString::fromLatin1("</td>");
- 		}
- 		m_searchAnalysisHTML += QString::fromLatin1("</tr>\n");
- 		ok = key.next(CSwordVerseKey::UseBook);
- 	}
- 	text += QString::fromLatin1("<table>\n") + tableTitle + tableTotals + m_searchAnalysisHTML + QString::fromLatin1("</table>\n");
- 	text += QString::fromLatin1("<center>") + i18n("Created by") + QString::fromLatin1(" <a href=\"http://www.bibletime.info/\">BibleTime</a></center>");
- 	text += QString::fromLatin1("</body></html>");
-
-	CToolClass::savePlainFile(file, text, false, QTextStream::UnicodeUTF8);
-}
diff --git a/bibletime/frontend/searchdialog/csearchdialog.h b/bibletime/frontend/searchdialog/csearchdialog.h
deleted file mode 100644
index c54dae6..0000000
--- a/bibletime/frontend/searchdialog/csearchdialog.h
+++ /dev/null
@@ -1,460 +0,0 @@
-/***************************************************************************
-                          csearchdialog.h  -  description
-                             -------------------
-    begin                : Die Jul 30 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSEARCHDIALOG_H
-#define CSEARCHDIALOG_H
-
-//BibleTime includes
-#include "csearchdialogpages.h"
-
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbackend.h"
-#include "backend/cswordmodulesearch.h"
-
-#include "util/cpointers.h"
-
-//Sword includes
-
-
-//Qt includes
-#include <qwidget.h>
-#include <qstring.h>
-#include <qcanvas.h>
-#include <qdict.h>
-#include <qtooltip.h>
-
-//KDE includes
-#include <kdialog.h>
-#include <kdialogbase.h>
-
-//forward declarations
-class CSearchAnalysisItem;
-class CSearchAnalysisLegendItem;
-class CSearchAnalysis;
-class CSearchAnalysisView;
-
-class QLineEdit;
-class QTextEdit;
-
-/**
-  *@author The BibleTime team
-  */
-
-class CSearchDialog : public KDialogBase  {
-  Q_OBJECT
-
-public:
-  static void openDialog(const ListCSwordModuleInfo modules, const QString& searchText = QString::null, QWidget* parentDialog = 0);
-
-public slots: // Public slots
-  /**
-  * Reimplemented to show the First time searchdialog page.
-  */
-  virtual void show();
-  
-protected:
-  friend class CSearchAnalysis;
-  friend class CSearchResultPage;  
-  /**
-  * Only interesting for the class members! Useful to get the searched text etc.
-  */
-  static CSearchDialog* const getSearchDialog();
-
-  /**
-  * The cinstructor of the dialog. It's protected because you should use the static public function openDialog.
-  * The dialog destroys itself if it was closed.
-  */
-	CSearchDialog(QWidget *parent);
-	virtual ~CSearchDialog();
-  /**
-  * Initializes this object.
-  */
-  void initView();
-  /**
-  * Starts the search with the given module list and given search text.
-  * Doesn't wait for the start button press, starts immediatly
-  */
-  void startSearch( const ListCSwordModuleInfo modules, const QString& searchText);
-  /**
-  * Sets the list of modules for the search.
-  */
-  void setModules( const ListCSwordModuleInfo modules );
-  /**
-  * Returns the list of used modules.
-  */
-  const ListCSwordModuleInfo modules();
-  /**
-  * Returns the search text which is used for the search.
-  */
-  void setSearchText( const QString searchText );
-  /**
-  * Returns the search text which is set currently.
-  */
-  const QString searchText();
-  /**
-  * Returns the used search scope as a list key
-  */
-  sword::ListKey searchScope();
-  /**
-  * Returns true if the search used a scope, otherwise false.
-  */
-  const CSwordModuleSearch::scopeType searchScopeType() const;  
-  /**
-  * Returns they type of search which is set
-  */
-  const int searchFlags() const;
-  /**
-  * Resets the parts to the default.
-  */
-  void reset();
- 
-protected slots:
-  /**
-  * Updates the percentage bars.
-  */
-  void percentUpdate();
-  /**
-  * Starts the search with the set modules and the set search text.
-  */
-  void startSearch();
-  void searchFinished();
-  void showModulesSelector();
-  /**
-  * Initializes the signal slot connections
-  */
-  void initConnections();
-  /**
-  * Updates the progress.
-  */
-  void updateProgress();
-  /**
-  * Interrupts the search.
-  */
-  void interruptSearch();
-  /**
-  * Is the slot which is called when a page will be shown.
-  */
-  void slotShowPage(QWidget* page);
-  /** Reimplementation. */
-  virtual void slotClose();
-
-private:
-  CSearchResultPage* m_searchResultPage;
-  CSearchOptionsPage* m_searchOptionsPage;
-	CSwordModuleSearch m_searcher;
-  struct {
-    int optionsPage;
-    int resultPage;
-  } m_index;
-  bool m_interruptedSearch;
-};
-
-class CModuleChooser : public KListView, public CPointers {
-  Q_OBJECT
-public:
-  class ModuleCheckBoxItem : virtual public QCheckListItem {
-  public:
-    ModuleCheckBoxItem(QListViewItem* item, CSwordModuleInfo* module);
-    ~ModuleCheckBoxItem();
-    /**
-    * Returns the used module.
-    */
-    CSwordModuleInfo* const module() const;
-  private:
-    CSwordModuleInfo* m_module;
-  };
-
-  CModuleChooser(QWidget* parent);
-  ~CModuleChooser();
-  /**
-  * Sets the list of modules and updates the state of the checkbox items.
-  */
-  void setModules( ListCSwordModuleInfo modules );
-  /**
-  * Returns a list of selected modules.
-  */
-  ListCSwordModuleInfo modules();
-
-public slots:
-  /**
-  * Reimplemented to open the folders which contain checked module items
-  */
-  virtual void show();
-
-  
-protected: // Protected methods
-  /**
-  * Initializes this widget and the childs of it.
-  */
-  void initView();
-  /**
-  * Initializes the tree of this widget.
-  */
-  void initTree();
-};
-
-class CModuleChooserDialog : public KDialogBase  {
-  Q_OBJECT
-public:
-  CModuleChooserDialog(QWidget* parentDialog, ListCSwordModuleInfo modules);
-  ~CModuleChooserDialog();
-
-signals:
-  void modulesChanged(ListCSwordModuleInfo modules);
-
-protected: // Protected methods
-  /**
-  * Initializes the view of this dialog
-  */
-  void initView();
-  /**
-  * Initializes the connections of this dialog.
-  */
-  void initConnections();
-
-protected slots: // Protected slots
-  /**
-  * Reimplementation to handle the modules.
-  */
-  virtual void slotOk();
-
-private:
-  CModuleChooser* m_moduleChooser;
-};
-
-class CSearchAnalysisDialog : public KDialogBase  {
-  Q_OBJECT
-public:
-  CSearchAnalysisDialog(ListCSwordModuleInfo modules, QWidget* parentDialog);
-  ~CSearchAnalysisDialog();
-
-protected: // Protected methods
-  /**
-  * Initializes the widgets SIGNAL and SLOT connections,.
-  */
-  void initConnections();
-  /**
-  * Initializes this dialog.
-  */
-  void initView();
-
-private:
-  CSearchAnalysis* m_analysis;
-  CSearchAnalysisView* m_analysisView;
-};
-
-class CRangeChooserDialog : public KDialogBase {
-  Q_OBJECT
-public:
-  CRangeChooserDialog(QWidget* parentDialog);
-  ~CRangeChooserDialog();
-
-protected: // Protected methods
-  class RangeItem : public KListViewItem {
-  public:
-    RangeItem(QListView*, QListViewItem* afterThis = 0, const QString caption = QString::null, const QString range = QString::null);
-    ~RangeItem();
-    const QString& range();
-    const QString caption();
-    void setRange(QString range);
-    void setCaption(const QString);
-  private:
-    QString m_range;
-  };
-
-  /**
-  * Initializes the connections of this widget.
-  */
-  void initConnections();
-  /**
-  * Initializes the view of this object.
-  */
-  void initView();
-
-protected slots: // Protected slots
-  /**
-  * Adds a new range to the list.
-  */
-  void addNewRange();
-  void editRange(QListViewItem*);
-  /**
-  * Parses the entered text and prints out the result in the list box below the edit area.
-  */
-  void parseRange();
-  void nameChanged(const QString&);
-  void rangeChanged();
-  /**
-  * Deletes the selected range.
-  */
-  void deleteCurrentRange();
-  virtual void slotDefault();
-  virtual void slotOk();  
-
-private:
-  KListView* m_rangeList;
-  KListView* m_resultList;
-  QLineEdit* m_nameEdit;
-  QTextEdit* m_rangeEdit;
-  QPushButton* m_newRangeButton;
-  QPushButton* m_deleteRangeButton;
-};
-
-/**
-	* CSearchDialogAnaylsis shows the graphical analysis of the search result.
-  * @author The BibleTime Team
-  */
-class CSearchAnalysis : public QCanvas {
-   Q_OBJECT
-public:	
-	CSearchAnalysis(QObject *parent=0, const char *name=0);
-  virtual ~CSearchAnalysis();
-  /**
-  * Starts the analysis of the search result.
-	* This should be called only once because
-	*	QCanvas handles the updates automatically.
-	*/
-  void analyse(ListCSwordModuleInfo modules);
-  /**
-  * This function returns a color for each module
-  * @return The color at position index in the list
-  */
-  static QColor getColor(int index);
- 	/*
- 	* This function returns a pointer to the list of AnalysisItems
- 	*/
- 	QDict<CSearchAnalysisItem>* getSearchAnalysisItemList();
-  void reset();
-
-protected slots: // Protected slots
-  /**
-  * No descriptions
-  */
-  void slotResized();
-
-protected:
-  void setModules(ListCSwordModuleInfo modules);
-
-private:
-  /**
-  * Returns the count of the book in the module
-  */
-  const unsigned int getCount( const QString book, CSwordModuleInfo* module );
-	
-	ListCSwordModuleInfo m_moduleList;
- 	QDict<CSearchAnalysisItem> m_canvasItemList;
- 	QMap<CSwordModuleInfo*,unsigned int> m_lastPosList; 	
-  int m_maxCount;
-  double m_scaleFactor;
-  CSearchAnalysisLegendItem* m_legend;
-
-public slots: // Public slots
-  void saveAsHTML();
-};
-
-
-//----------------------------------------------------------
-//----------------------------------------------------------
-
-/** Paints the bars for one book for one or more modules
-	*
-	*/
-class CSearchAnalysisItem : public QCanvasRectangle  {
-public:	
-	/**
-	* Standard constructor.
-	*/
-	CSearchAnalysisItem(QCanvas* parent, const int moduleCount, const QString& bookname, double *scaleFactor, ListCSwordModuleInfo* modules);
-	virtual ~CSearchAnalysisItem();	
-  /**
-  * Sets the resultcount of this item
-  */
-  void setCountForModule( const int moduleIndex, const int count);
-
-  /**
-  * Returns the resultcount of this item
-  */
-	int getCountForModule( const int moduleIndex);
-  /**
-  * Returns the width of this item.
-  */
-  virtual int width();
-  /**
-  * Returns the tooltip for this item.
-  */
-  const QString getToolTip();
-  	
-private:
-  virtual void draw (QPainter & painter);	
-	
-	ListCSwordModuleInfo* m_moduleList;	
-	double *m_scaleFactor;
-	QString m_bookName;
- 	int m_moduleCount;
- 	QMemArray<int> m_resultCountArray;
- 	QPixmap* m_bufferPixmap;
-};
-
-class CSearchAnalysisLegendItem : public QCanvasRectangle  {
-
-public:	
-	CSearchAnalysisLegendItem(QCanvas* parent, ListCSwordModuleInfo* list );
-
-private:
-  virtual void draw (QPainter & painter);
-  ListCSwordModuleInfo* m_moduleList;
-};
-
-//----------------------------------------------------------
-//----------------------------------------------------------
-class CSearchAnalysisView : public QCanvasView  {
-   Q_OBJECT
-public:
-	/**
-	* Standard constructor
-	*/
-	CSearchAnalysisView(QCanvas* canvas, QWidget* parent);
-  /**
-  * Returns the sizeHint for this view
-  * We give back the size of the parent widgetas default.
-  * This is a reimplementation from QCanvasView::sizeHint().
-  */
-  virtual QSize sizeHint();	
-  /**
-  * Returns the item at position p.
-	* If there no item at that point return 0.
-	*/
-  CSearchAnalysisItem* itemAt( const QPoint& p );
-
-protected:
-  /**
-  * Reimplementation.
-  */
-  virtual void resizeEvent(QResizeEvent* e);
-
-private:
-	class ToolTip : public QToolTip {
-	public:
-		ToolTip(QWidget* parent);
-		/**
-		* Displays a tooltip for position p
-		*/		
-		virtual void maybeTip(const QPoint &pos);
-	};
-	ToolTip* m_toolTip;	
-};
-
-#endif
diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.cpp b/bibletime/frontend/searchdialog/csearchdialogpages.cpp
deleted file mode 100644
index ac4eb3c..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogpages.cpp
+++ /dev/null
@@ -1,851 +0,0 @@
-/***************************************************************************
-                          csearchdialogpages.cpp  -  description
-                             -------------------
-    begin                : Die Jul 30 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "csearchdialogpages.h"
-
-#include "csearchdialog.h"
-
-#include "backend/centrydisplay.h"
-
-#include "frontend/cbtconfig.h"
-#include "frontend/cdragdropmgr.h"
-#include "frontend/cexportmanager.h"
-#include "frontend/display/cdisplay.h"
-#include "frontend/display/creaddisplay.h"
-
-#include "util/cresmgr.h"
-#include "util/cpointers.h"
-#include "util/ctoolclass.h"
-
-//Qt includes
-#include <qlayout.h>
-#include <qhbox.h>
-#include <qlabel.h>
-#include <qlistview.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
-#include <qsplitter.h>
-#include <qtooltip.h>
-#include <qbuttongroup.h>
-#include <qcheckbox.h>
-#include <qwhatsthis.h>
-#include <qheader.h>
-#include <qgroupbox.h>
-#include <qregexp.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kaction.h>
-#include <klistview.h>
-#include <kcombobox.h>
-#include <kprogress.h>
-#include <kpopupmenu.h>
-#include <ksqueezedtextlabel.h>
-
-/********************************************
-************  ModuleResultList **************
-********************************************/
-
-CSearchResultView::CSearchResultView(QWidget* parent) : KListView(parent), m_module(0) {
-  initView();
-  initConnections();
-};
-
-CSearchResultView::~CSearchResultView() {
-};
-
-/** Initializes the view of this widget. */
-void CSearchResultView::initView(){
-  addColumn(i18n("Found items"));
-  setFullWidth(true);
-  setSorting(-1);
-  setDragEnabled(true);  
-  setSelectionModeExt(KListView::Extended);
-
-  //setup the popup menu
-  m_popup = new KPopupMenu(this);
-//	m_popup->insertTitle(i18n("Bible window"));
-
- 	m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::foundItems::copyMenu::icon);
- 	m_actions.copy.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(copyItems()), this);
- 	m_actions.copyMenu->insert(m_actions.copy.result);
- 	m_actions.copy.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(copyItemsWithText()), this);
- 	m_actions.copyMenu->insert(m_actions.copy.resultWithText);
- 	m_actions.copyMenu->plug(m_popup);
-
- 	m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::searchdialog::result::foundItems::saveMenu::icon);
- 	m_actions.save.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(saveItems()), this);
- 	m_actions.saveMenu->insert(m_actions.save.result);
- 	m_actions.save.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(saveItemsWithText()), this);
- 	m_actions.saveMenu->insert(m_actions.save.resultWithText);
- 	m_actions.saveMenu->plug(m_popup);
-
- 	m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::searchdialog::result::foundItems::printMenu::icon);
- 	m_actions.print.result = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(printItems()), this);
- 	m_actions.printMenu->insert(m_actions.print.result);
-  m_actions.printMenu->plug(m_popup);  
-}
-
-/** No descriptions */
-void CSearchResultView::initConnections(){
-//  connect(this, SIGNAL(executed(QListViewItem*)),
-//	  this, SLOT(executed(QListViewItem*)));
-  connect(this, SIGNAL(currentChanged(QListViewItem*)),
-	  this, SLOT(executed(QListViewItem*)));
-    
-  connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)),
-    this, SLOT(showPopup(KListView*, QListViewItem*, const QPoint&)));    
-}
-
-/** Setups the list with the given module. */
-void CSearchResultView::setupTree(CSwordModuleInfo* m){
-  clear();
-  if (!m)
-    return;
-  m_module = m;
-
-  sword::ListKey result = m->searchResult();
-	const int count = result.Count();
-  if (!count)
-    return;
-
-  setUpdatesEnabled(false);
-
-  QListViewItem* oldItem = 0;
-  KListViewItem* item = 0;
-  for (int index = 0; index < count; index++) {
-    item = new KListViewItem(this, oldItem);
-    item->setText(0,QString::fromLocal8Bit((const char*)*result.GetElement(index)));
-    oldItem = item;
-  }
-
-  setUpdatesEnabled(true);
-
-  setSelected(firstChild(), true);
-  executed(currentItem());
-}
-
-/** Is connected to the signal executed, which is emitted when a mew item was chosen. */
-void CSearchResultView::executed(QListViewItem* item){
-//  Q_ASSERT(item);
-//  qWarning("executed");
-  emit keySelected(item->text(0));
-}
-
-/** Reimplementation to show the popup menu. */
-void CSearchResultView::showPopup(KListView*, QListViewItem*, const QPoint& point){
-  m_popup->exec(point);
-}
-
-/** No descriptions */
-void CSearchResultView::printItems(){
-  QPtrList<QListViewItem> items = selectedItems();
-  CExportManager mgr(i18n("Print search result..."), true, i18n("Printing search result"));
-
-  PrintItemList list;
-  for (QListViewItem* k = items.first(); k; k = items.next()) {
-    list.append( QStringPair(k->text(0), QString::null) );
-  };
-  mgr.printKeyList( list, module() );
-}
-
-/** No descriptions */
-void CSearchResultView::saveItems(){
-  CExportManager mgr(i18n("Save search result..."), true, i18n("Saving search result"));
-
-  CSwordModuleInfo* m = module();
-  CSwordKey* k = 0;
-  QPtrList<QListViewItem> items = selectedItems();
-  QPtrList<CSwordKey> keys;  
-  for (QListViewItem* i = items.first(); i; i = items.next()) {
-    k = CSwordKey::createInstance( m );
-    k->key(i->text(0));
-    keys.append( k );
-  };
-  mgr.saveKeyList( keys, CExportManager::Text, false);
-
-  keys.setAutoDelete(true);
-  keys.clear(); //delete all the keys we created
-}
-
-/** No descriptions */
-void CSearchResultView::saveItemsWithText(){
-  CExportManager mgr(i18n("Save search result..."), true, i18n("Saving search result"));
-
-  CSwordModuleInfo* m = module();
-  CSwordKey* k = 0;
-  QPtrList<QListViewItem> items = selectedItems();
-  QPtrList<CSwordKey> keys;
-  for (QListViewItem* i = items.first(); i; i = items.next()) {
-    k = CSwordKey::createInstance( m );
-    k->key(i->text(0));
-    keys.append( k );
-  };
-  mgr.saveKeyList( keys, CExportManager::Text, true);
-
-  keys.setAutoDelete(true);
-  keys.clear(); //delete all the keys we created
-}
-
-/** No descriptions */
-void CSearchResultView::copyItems(){
-  CExportManager mgr(i18n("Copy search result..."), true, i18n("Copying search result"));
-
-  CSwordModuleInfo* m = module();
-  CSwordKey* k = 0;
-  QPtrList<QListViewItem> items = selectedItems();
-  QPtrList<CSwordKey> keys;
-  for (QListViewItem* i = items.first(); i; i = items.next()) {
-    k = CSwordKey::createInstance( m );
-    k->key(i->text(0));
-    keys.append( k );
-  };
-  mgr.copyKeyList( keys, CExportManager::Text, false);
-
-  keys.setAutoDelete(true);
-  keys.clear(); //delete all the keys we created
-
-}
-
-/** No descriptions */
-void CSearchResultView::copyItemsWithText(){
-  CExportManager mgr(i18n("Copy search result..."), true, i18n("Copying search result"));
-
-  CSwordModuleInfo* m = module();
-  CSwordKey* k = 0;
-  QPtrList<QListViewItem> items = selectedItems();
-  QPtrList<CSwordKey> keys;
-  for (QListViewItem* i = items.first(); i; i = items.next()) {
-    k = CSwordKey::createInstance( m );
-    k->key(i->text(0));
-    keys.append( k );
-  };
-  mgr.copyKeyList( keys, CExportManager::Text, true);
-
-  keys.setAutoDelete(true);
-  keys.clear(); //delete all the keys we created  
-}
-
-/** Returns the module which is currently used. */
-CSwordModuleInfo* const CSearchResultView::module(){
-  return m_module;
-}
-
-QDragObject* CSearchResultView::dragObject() {
-  //return a valid DragObject to make DnD possible!
-
-  /*  
-  * First get all selected items and fill with them the dndItems list. The return the QDragObject we got from CDRagDropMgr
-  */
-  CDragDropMgr::ItemList dndItems;
-
-  QPtrList<QListViewItem> items = selectedItems();
-  for (items.first(); items.current(); items.next()) {
-    dndItems.append( CDragDropMgr::Item(m_module->name(), items.current()->text(0), QString::null) ); //no description
-  };
-      
-  return CDragDropMgr::dragObject(dndItems, viewport());
-};
-
-/********************************************
-************  ModuleResultList **************
-********************************************/
-
-CModuleResultView::CModuleResultView(QWidget* parent) : KListView(parent) {
-  initView();
-  initConnections();
-};
-
-CModuleResultView::~CModuleResultView() {
-
-};
-
-/** Initializes this widget. */
-void CModuleResultView::initView(){
-  addColumn(i18n("Module"));
-  addColumn(i18n("Found items"));
-  
-//  setFullWidth(true);
-  setSorting(0, true);
-  setSorting(1, true);
-  setAllColumnsShowFocus(true);
-
-
-  //setup the popup menu
-  m_popup = new KPopupMenu(this);
-//	m_popup->insertTitle(i18n("Bible window"));
-
- 	m_actions.copyMenu = new KActionMenu(i18n("Copy..."), CResMgr::searchdialog::result::moduleList::copyMenu::icon);
- 	m_actions.copy.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(copyResult()), this);
- 	m_actions.copyMenu->insert(m_actions.copy.result);
- 	m_actions.copy.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(copyResultWithText()), this);
- 	m_actions.copyMenu->insert(m_actions.copy.resultWithText);
- 	m_actions.copyMenu->plug(m_popup);
-
- 	m_actions.saveMenu = new KActionMenu(i18n("Save..."),CResMgr::searchdialog::result::moduleList::saveMenu::icon);
- 	m_actions.save.result = new KAction(i18n("Reference only"), KShortcut(0), this, SLOT(saveResult()), this);
- 	m_actions.saveMenu->insert(m_actions.save.result);
- 	m_actions.save.resultWithText = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(saveResultWithText()), this);
- 	m_actions.saveMenu->insert(m_actions.save.resultWithText);
- 	m_actions.saveMenu->plug(m_popup);
-
- 	m_actions.printMenu = new KActionMenu(i18n("Print..."),CResMgr::searchdialog::result::moduleList::printMenu::icon);
- 	m_actions.print.result = new KAction(i18n("Reference with text"), KShortcut(0), this, SLOT(printResult()), this);
- 	m_actions.printMenu->insert(m_actions.print.result);
-
-
-  m_actions.printMenu->plug(m_popup);  
-}
-
-/** Initializes the connections of this widget, */
-void CModuleResultView::initConnections(){
-  connect(this, SIGNAL(executed(QListViewItem*)),
-    SLOT(executed(QListViewItem*)));
-  connect(this, SIGNAL(contextMenu(KListView*, QListViewItem*, const QPoint&)),
-    this, SLOT(showPopup(KListView*, QListViewItem*, const QPoint&)));
-}
-
-/** Setups the tree using the given list of modules. */
-void CModuleResultView::setupTree( ListCSwordModuleInfo modules ){
-  clear();
-  QListViewItem* item = 0;
-  QListViewItem* oldItem = 0;
-  sword::ListKey result;
-  for (modules.first(); modules.current(); modules.next()) {
-		result = modules.current()->searchResult();
-		item = new KListViewItem(this, modules.current()->name(), QString::number(result.Count()) );
-		item->setPixmap(0,CToolClass::getIconForModule(modules.current()) );
-    oldItem = item;
-  };
-
-  setSelected(currentItem(), true);
-  executed(currentItem());
-}
-
-
-/** Is executed when an item was selected in the list. */
-void CModuleResultView::executed( QListViewItem* i ){
-  if (CSwordModuleInfo* m = CPointers::backend()->findModuleByName(i->text(0))) {
-    emit moduleChanged();
-    emit moduleSelected(m);
-  }
-}
-
-/** Returns the currently active module. */
-CSwordModuleInfo* const CModuleResultView::activeModule(){
-  Q_ASSERT(currentItem());
-  if (currentItem())
-    return CPointers::backend()->findModuleByName(currentItem()->text(0));
-  return 0;
-}
-
-/** No descriptions */
-void CModuleResultView::showPopup(KListView*, QListViewItem*, const QPoint& point){
-  //make sure that all entries have the correct status
-  m_popup->exec(point);
-}
-
-/** Copies the whole search result into the clipboard. */
-void CModuleResultView::copyResult(){
-  if (CSwordModuleInfo* m = activeModule()) {
-    sword::ListKey result = m->searchResult();
-    CExportManager mgr(i18n("Copy search result..."), true, i18n("Copying search result"));
-    mgr.copyKeyList(&result,m,CExportManager::Text,false);
-  };  
-}
-
-/** Copies the whole search result with the text into the clipboard. */
-void CModuleResultView::copyResultWithText(){
-  if (CSwordModuleInfo* m = activeModule()) {
-    sword::ListKey result = m->searchResult();
-    CExportManager mgr(i18n("Copy search result..."), true, i18n("Copying search result"));
-    mgr.copyKeyList(&result,m,CExportManager::Text,true);
-  };
-}
-
-/** Saves the search result keys. */
-void CModuleResultView::saveResult(){
-  if (CSwordModuleInfo* m = activeModule()) {
-    sword::ListKey result = m->searchResult();
-    CExportManager mgr(i18n("Save search result..."), true, i18n("Saving search result"));
-    mgr.saveKeyList(&result,m,CExportManager::Text,false);
-  };  
-}
-
-/** Saves the search result with it's text. */
-void CModuleResultView::saveResultWithText(){
-  if (CSwordModuleInfo* m = activeModule()) {
-    sword::ListKey result = m->searchResult();
-    CExportManager mgr(i18n("Save search result..."), true, i18n("Saving search result"));
-    mgr.saveKeyList(&result,m,CExportManager::Text,true);
-  };
-}
-
-/** Appends the whole search result to the printer queue. */
-void CModuleResultView::printResult(){
-  if (CSwordModuleInfo* m = activeModule()) {
-    sword::ListKey result = m->searchResult();
-    CExportManager mgr(i18n("Print search result..."), true, i18n("Printing search result"));
-    mgr.printKeyList(&result,m);
-  };
-}
-
-/********************************************
-**********  CSearchDialogResultPage *********
-********************************************/
-
-CSearchResultPage::CSearchResultPage(QWidget *parent, const char *name ) : QWidget(parent,name) {
-  initView();
-  initConnections();
-}
-
-CSearchResultPage::~CSearchResultPage(){
-
-}
-
-/** Initializes the view of this widget. */
-void CSearchResultPage::initView(){
-  QVBoxLayout* mainLayout = new QVBoxLayout(this);
-
-  QSplitter* splitter = new QSplitter(Vertical, this);
-  mainLayout->addWidget(splitter);
-
-//  QHBox* layoutBox = new QHBox(splitter);
-//  layoutBox->setSpacing(3);
-  QSplitter* hSplitter = new QSplitter(Horizontal, splitter);
-  m_moduleListBox = new CModuleResultView(hSplitter);
-//  m_moduleListBox->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
-//  layoutBox->setStretchFactor(m_moduleListBox, 0);
-  m_resultListBox = new CSearchResultView(hSplitter);
-  hSplitter->setResizeMode(m_moduleListBox, QSplitter::FollowSizeHint);
-  hSplitter->setResizeMode(m_resultListBox, QSplitter::Stretch);
-
-//  layoutBox->setStretchFactor(m_resultListBox, 5);  
-
-  m_previewDisplay = CDisplay::createReadInstance(0, splitter);  
-
-  m_moduleListBox->resize(m_moduleListBox->sizeHint());
-  splitter->setResizeMode(hSplitter, QSplitter::KeepSize);
-  splitter->setResizeMode(m_previewDisplay->view(), QSplitter::Stretch);
-  
-  m_analyseButton = new QPushButton(i18n("Show search analysis"), this);
-  connect(m_analyseButton, SIGNAL(clicked()),
-    this, SLOT(showAnalysis()));
-  mainLayout->addSpacing(5);
-  mainLayout->addWidget(m_analyseButton);
-}
-
-/** Sets the modules which contain the result of each. */
-void CSearchResultPage::setSearchResult(ListCSwordModuleInfo modules){
-  reset(); //clear current modules
-  
-  m_modules = modules;
-  m_moduleListBox->setupTree(modules);
-  m_moduleListBox->setMinimumWidth(m_moduleListBox->sizeHint().width());
-  m_moduleListBox->adjustSize();
-//  m_moduleListBox->parentWidget()->adjustSize();
-
-  
-  //have a Bible or commentary in the modules?
-  bool enable = false;
-  for (modules.first(); !enable && modules.current(); modules.next()) {
-    if (modules.current()->type() == CSwordModuleInfo::Bible ) {
-      enable = true;
-    };
-  };
-  m_analyseButton->setEnabled(enable);
-}
-
-
-/** Resets the current list of modules and the displayed list of found entries. */
-void CSearchResultPage::reset(){
-  m_moduleListBox->clear();
-  m_resultListBox->clear();
-  m_previewDisplay->setText(QString::null);
-  m_analyseButton->setEnabled(false);
-  m_modules.setAutoDelete(false); //make sure we don't delete modules accidentally
-  m_modules.clear();
-}
-
-
-/** Update the preview of the selected key. */
-void CSearchResultPage::updatePreview(const QString& key){
-  if ( CSwordModuleInfo* module = m_moduleListBox->activeModule() ) {
-  	if (CEntryDisplay* display = module->getDisplay()) {	//do we have a display object?
-      ListCSwordModuleInfo moduleList;
-      moduleList.append(module);
-
-      //mark the searched text part
-      const QString searchedText = CSearchDialog::getSearchDialog()->searchText();
-      const int searchFlags = CSearchDialog::getSearchDialog()->searchFlags();            
-      const QString content = display->text( moduleList, key, CBTConfig::getDisplayOptionDefaults(), CBTConfig::getFilterOptionDefaults() );
-
-      const QString text = highlightSearchedText(content, searchedText, searchFlags);
-      
-   		m_previewDisplay->setText( text );
-      m_previewDisplay->moveToAnchor( key );      
-  	}	
-    else
-      m_previewDisplay->setText(QString::null);
-  }
-}
-
-const QString CSearchResultPage::highlightSearchedText(const QString& content, const QString& searchedText, const int searchFlags) {
-  QString ret = content;
-  const bool cs = (searchFlags & CSwordModuleSearch::caseSensitive);
-
-  int index = 0;
-  int length = searchedText.length();
-
-  const QString rep1 = QString::fromLatin1("<B STYLE=\"background-color:#FFFF66;\">");
-  const QString rep2 = QString::fromLatin1("</B>");
-  const unsigned int repLength = rep1.length() + rep1.length();
-
-  
-  if (searchFlags & CSwordModuleSearch::exactPhrase) { //exact phrase matching      
-    while ( (index = ret.find(searchedText, index, cs)) != -1 ) {
-      if (!CToolClass::inHTMLTag(index, ret)) {
-        ret = ret.insert( index+length, rep2 );
-        ret = ret.insert( index, rep1 );
-        index += repLength;
-      }
-      index += repLength;
-    };
-  }
-  else if (searchFlags & CSwordModuleSearch::multipleWords) { //multiple words
-    QStringList words = QStringList::split(" ", searchedText);
-    for ( int wi = 0; (unsigned int)wi < words.count(); ++wi ) { //search for every word in the list
-      QString word = words[ wi ];
-      length = word.length();
-      index = 0; //for every word start at the beginning
-      while ( (index = ret.find(word, index, cs)) != -1 ) { //while we found the word
-        if (!CToolClass::inHTMLTag(index, ret)) {
-          ret = ret.insert( index+length, rep2 );
-          ret = ret.insert( index, rep1 );
-          index += repLength;
-        }
-        index += length;
-      }
-    }
-  }
-  else { //multiple words or regular expression
-    //use re as regular expression and replace any occurences
-    QRegExp regExp( searchedText, cs );
-    regExp.setMinimal( true );
-
-    while ( (index = regExp.search(ret, index)) != -1 ) {
-      if (!CToolClass::inHTMLTag(index, ret)) {
-        ret = ret.insert( index + regExp.matchedLength(), rep2 );
-        ret = ret.insert( index, rep1 );
-        index += regExp.matchedLength() + repLength;          
-      }
-      index += length;
-    }
-  }
-
-  return ret; //not implemented yet
-};
-
-/** Initializes the signal slot conections of the child widgets, */
-void CSearchResultPage::initConnections(){
-  connect(m_resultListBox, SIGNAL(keySelected(const QString&)),
-    this, SLOT(updatePreview(const QString&)));
-  connect(m_moduleListBox, SIGNAL(moduleSelected(CSwordModuleInfo*)),
-    m_resultListBox, SLOT(setupTree(CSwordModuleInfo*)));
-  connect(m_moduleListBox, SIGNAL(moduleChanged()),
-    m_previewDisplay->connectionsProxy(), SLOT(clear()));
-}
-
-/** Shows a dialog with the search analysis of the current search. */
-void CSearchResultPage::showAnalysis(){
-  CSearchAnalysisDialog dlg(m_modules, this);
-  dlg.exec();
-}
-
-/*************************/
-
-CSearchOptionsPage::CSearchOptionsPage(QWidget *parent, const char *name ) : QWidget(parent,name) {
-  initView();
-  readSettings();
-}
-
-CSearchOptionsPage::~CSearchOptionsPage() {
-  saveSettings();
-}
-
-/** Returns the search text set in this page. */
-const QString CSearchOptionsPage::searchText() {
-  // we emulate OR by RegExp
-  if (m_multipleWordsORRadio->isChecked()) {
-    QString regexp(m_searchTextCombo->currentText());
-    regexp = regexp.simplifyWhiteSpace();
-    regexp.replace( QRegExp("\\s+"), "|" ); //replace one or more white spaces with regexp's OR marker
-    return regexp;
-  }
-  return m_searchTextCombo->currentText();
-}
-
-/** Sets the search text used in the page. */
-void CSearchOptionsPage::setSearchText(const QString& text) {
-  bool found = false;
-  int i = 0;
-	for (i = 0; !found && i < m_searchTextCombo->count(); ++i) {
-		if (m_searchTextCombo->text(i) == text) {
-			found = true;
-    }
-	}
-
-	if (!found) {
-    i = 0;
-		m_searchTextCombo->insertItem( text,0 );
-	}
-
-  m_searchTextCombo->setCurrentItem(i);
-  m_searchTextCombo->reset();
-	m_searchTextCombo->setFocus();	
-}
-
-/** Initializes this page. */
-void CSearchOptionsPage::initView(){
-  QGridLayout* grid = new QGridLayout(this,11,3);
-  grid->setSpacing(3);
-
-	QGroupBox* box1 = new QGroupBox(2, Qt::Horizontal , i18n("Main search parameters"), this);
-  grid->addMultiCellWidget(box1, 0,1,0,2);
-
-  m_modulesLabel = new QLabel(box1);
-  m_modulesLabel->setTextFormat(Qt::RichText);
-  m_modulesLabel->setAlignment( AlignLeft | WordBreak );
-
-  m_chooseModulesButton = new QPushButton(i18n("Choose modules"), box1);
-  connect(m_chooseModulesButton, SIGNAL(clicked()),
-	  this, SLOT(chooseModules()));
-  QToolTip::add(m_chooseModulesButton, CResMgr::searchdialog::options::moduleChooserButton::tooltip);
-  QWhatsThis::add(m_chooseModulesButton, CResMgr::searchdialog::options::moduleChooserButton::whatsthis);
-
-  QLabel* label = new QLabel(box1);
-  label->setText(i18n("Search text:"));
-  m_searchTextCombo = new KHistoryCombo(box1);
-  label->setAutoResize(true);
-
-  m_searchTextCombo->setInsertionPolicy( QComboBox::AtBottom );
-  m_searchTextCombo->setMaxCount(25);
-  m_searchTextCombo->setDuplicatesEnabled(false);
-  m_searchTextCombo->setFocusPolicy(QWidget::WheelFocus);
-  connect( m_searchTextCombo, SIGNAL(activated( const QString& )),
-    m_searchTextCombo, SLOT( addToHistory( const QString& ))
-  );
-  connect( m_searchTextCombo, SIGNAL(returnPressed ( const QString& )),
-    m_searchTextCombo, SLOT(addToHistory(const QString&))
-  );
-
-  QToolTip::add(m_searchTextCombo, CResMgr::searchdialog::options::searchedText::tooltip);
-  QWhatsThis::add(m_searchTextCombo, CResMgr::searchdialog::options::searchedText::whatsthis);
-  
-  QButtonGroup* group  = new QButtonGroup(4, Vertical,i18n("Search type"), this);
-    
-  m_multipleWordsRadio = new QRadioButton(i18n("Multiple words (AND)"), group);
-  m_multipleWordsRadio->setChecked( true );
-  QToolTip::add(m_multipleWordsRadio, CResMgr::searchdialog::options::searchType::multipleWords_and::tooltip);
-  QWhatsThis::add(m_multipleWordsRadio, CResMgr::searchdialog::options::searchType::multipleWords_and::whatsthis);
-
-  
-  m_multipleWordsORRadio =  new QRadioButton(i18n("Multiple words (OR)"), group);
-  QToolTip::add(m_multipleWordsORRadio, CResMgr::searchdialog::options::searchType::multipleWords_or::tooltip);
-  QWhatsThis::add(m_multipleWordsORRadio, CResMgr::searchdialog::options::searchType::multipleWords_or::whatsthis);
-  
-  m_exactTextRadio = new QRadioButton(i18n("Exact"), group);
-  QToolTip::add(m_exactTextRadio, CResMgr::searchdialog::options::searchType::exactMatch::tooltip);
-  QWhatsThis::add(m_exactTextRadio, CResMgr::searchdialog::options::searchType::exactMatch::whatsthis);
-  
-  m_regexpRadio = new QRadioButton(i18n("Regular expression"), group);
-  QToolTip::add(m_regexpRadio, CResMgr::searchdialog::options::searchType::regExp::tooltip);
-  QWhatsThis::add(m_regexpRadio, CResMgr::searchdialog::options::searchType::regExp::whatsthis);
-
-  grid->addWidget(group, 4,0);
-
-  group = new QButtonGroup(1,Vertical,i18n("Search options"), this);
-  m_caseSensitiveBox = new QCheckBox(i18n("Case sensitive search"), group);
-  QToolTip::add(m_caseSensitiveBox, CResMgr::searchdialog::options::searchOptions::caseSensitive::tooltip);
-  QWhatsThis::add(m_caseSensitiveBox, CResMgr::searchdialog::options::searchOptions::caseSensitive::whatsthis);
-
-  grid->addWidget(group, 4,2);
-
-	QGroupBox* box2 = new QGroupBox(2, Qt::Horizontal , i18n("Search scope"), this);
-  grid->addMultiCellWidget(box2, 6,7,0,2);
-
-  m_rangeChooserCombo = new KComboBox(box2);
-  QToolTip::add(m_rangeChooserCombo, CResMgr::searchdialog::options::chooseScope::tooltip);
-  QWhatsThis::add(m_rangeChooserCombo, CResMgr::searchdialog::options::chooseScope::whatsthis);
-
-  refreshRanges();  
-  m_chooseRangeButton = new QPushButton(i18n("Setup custom ranges"), box2);
-  connect(m_chooseRangeButton, SIGNAL(clicked()),
-    this, SLOT(setupRanges()));
-  
-  grid->setRowStretch(8,5);
-
-	QGroupBox* box3 = new QGroupBox(2, Qt::Horizontal , i18n("Search progress"), this);
-  grid->addMultiCellWidget(box3, 9,10,0,2);
-
-
-  label = new QLabel(i18n("Current module:"), box3);
-	m_currentProgressBar = new KProgress(box3);
-
-  label = new QLabel(i18n("All modules:"), box3);
-	m_overallProgressBar = new KProgress(box3);
-
-  //set the initial focus
-  m_searchTextCombo->setFocus();
-}
-
-/** Sets the modules used by the search. */
-void CSearchOptionsPage::setModules( ListCSwordModuleInfo modules ) {
-  QString t = i18n("Searching in: ");
-
-  m_modules.clear(); //remove old modules
-  // We make sure that a module is only one time in the list, e.g. if two display windows of the same module are opened
-  CSwordModuleInfo* current = modules.first();
-  while (current) {
-    if ( !m_modules.containsRef(current) ) {
-      m_modules.append( current );                     
-                         
-      t += current->name();
-      if (current != modules.getLast()) {
-        t += QString::fromLatin1(", ");
-      }
-    }
-    current = modules.next(); //next modules
-  };
-
-  m_modulesLabel->setText(t);
-}
-
-/** Opens the modules chooser dialog. */
-void CSearchOptionsPage::chooseModules(){
-  CModuleChooserDialog* dlg = new CModuleChooserDialog(this, modules());
-  connect(dlg, SIGNAL(modulesChanged(ListCSwordModuleInfo)),
-    this, SLOT(setModules(ListCSwordModuleInfo)));
-  dlg->exec();
-}
-
-/** Returns the list of used modules. */
-const ListCSwordModuleInfo CSearchOptionsPage::modules(){
-  return m_modules;
-}
-
-/** Prepares the stuff which is required for a search, e.g. setting back the percentage bars. */
-void CSearchOptionsPage::prepareSearch(){
-	m_overallProgressBar->setProgress(0);
-	m_currentProgressBar->setProgress(0);
-}
-
-/** Sets the value for the "curret module" progress bar. */
-void CSearchOptionsPage::setCurrentModuleProgress( const int progress ){
-	m_currentProgressBar->setProgress(progress);
-}
-
-/** Sets the progress for the "all modules" bar. */
-void CSearchOptionsPage::setOverallProgress( const int progress ){
-	m_overallProgressBar->setProgress(progress);
-}
-
-/** Return the selected search type,. */
-const int CSearchOptionsPage::searchFlags() {
-	int ret = CSwordModuleSearch::multipleWords;	//"multiple words" is standard
-	if (m_exactTextRadio->isChecked()) {
-		ret = CSwordModuleSearch::exactPhrase;
-	}
-	else if (m_regexpRadio->isChecked() || m_multipleWordsORRadio->isChecked()) {
-		ret = CSwordModuleSearch::regExp;
-	}
-	if (m_caseSensitiveBox->isChecked())
-	  ret |= CSwordModuleSearch::caseSensitive;
-	return ret;
-}
-
-/** Sets all options back to the default. */
-void CSearchOptionsPage::reset(){
-  m_multipleWordsRadio->setChecked(true);
-  m_rangeChooserCombo->setCurrentItem(0); //no scope
-  m_searchTextCombo->clearEdit();
-}
-
-/** Reads the settings for the searchdialog from disk. */
-void CSearchOptionsPage::saveSettings(){
-	CBTConfig::set(CBTConfig::searchCompletionTexts, m_searchTextCombo->completionObject()->items());
-	CBTConfig::set(CBTConfig::searchTexts, m_searchTextCombo->historyItems());	
-}
-
-/** Reads the settings of the last searchdialog session. */
-void CSearchOptionsPage::readSettings(){
-	m_searchTextCombo->completionObject()->setItems( CBTConfig::get(CBTConfig::searchCompletionTexts) );
-	m_searchTextCombo->setHistoryItems( CBTConfig::get(CBTConfig::searchTexts) );
-}
-
-void CSearchOptionsPage::aboutToShow(){
-  m_searchTextCombo->setFocus();
-}
-
-/** No descriptions */
-void CSearchOptionsPage::setupRanges(){
-  CRangeChooserDialog* chooser = new CRangeChooserDialog(this);
-  chooser->exec();
-
-  refreshRanges();
-}
-
-/** refreshes the listof ranges and the range combobox. */
-void CSearchOptionsPage::refreshRanges(){
-  //the first two options are fixed, the others can be edited using the "Setup ranges" button.
-  m_rangeChooserCombo->clear();
-  m_rangeChooserCombo->insertItem(i18n("No search scope"));
-  m_rangeChooserCombo->insertItem(i18n("Last search result"));
-
-  //insert the user-defined ranges
-  CBTConfig::StringMap map = CBTConfig::get(CBTConfig::searchScopes);
-  CBTConfig::StringMap::Iterator it;
-  for (it = map.begin(); it != map.end(); ++it) {
-    m_rangeChooserCombo->insertItem(it.key());
-  };
-}
-
-/** Returns the selected search scope if a search scope was selected. */
-sword::ListKey CSearchOptionsPage::searchScope(){
-  if (m_rangeChooserCombo->currentItem() > 1) { //neither "No Scope" nor "Last search result"
-    CBTConfig::StringMap map = CBTConfig::get(CBTConfig::searchScopes);
-    QString scope = map[ m_rangeChooserCombo->currentText() ];
-    if (!scope.isEmpty())
-      return sword::VerseKey().ParseVerseList( scope.local8Bit(), "Genesis 1:1", true);
-  };
-  return sword::ListKey();
-}
-
-/** Returns the selected scope type. */
-const CSwordModuleSearch::scopeType CSearchOptionsPage::scopeType(){
-  if (m_rangeChooserCombo->currentItem() == 0) {
-    return CSwordModuleSearch::Scope_NoScope;
-  }
-  else if (m_rangeChooserCombo->currentItem() == 1) {
-    return CSwordModuleSearch::Scope_LastSearch;
-  }
-  else {
-    return CSwordModuleSearch::Scope_Bounds;
-  };
-  return CSwordModuleSearch::Scope_NoScope;
-}
-
diff --git a/bibletime/frontend/searchdialog/csearchdialogpages.h b/bibletime/frontend/searchdialog/csearchdialogpages.h
deleted file mode 100644
index 8dd9fb2..0000000
--- a/bibletime/frontend/searchdialog/csearchdialogpages.h
+++ /dev/null
@@ -1,336 +0,0 @@
-/***************************************************************************
-                          csearchdialogpages.h  -  description
-                             -------------------
-    begin                : Die Jul 30 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSEARCHDIALOGPAGES_H
-#define CSEARCHDIALOGPAGES_H
-
-//BibleTime includes
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordbackend.h"
-#include "backend/cswordmodulesearch.h"
-
-//Qt includes
-#include <qwidget.h>
-
-//KDE includes
-#include <klistview.h>
-
-//forward declarations
-class QLabel;
-class QCheckBox;
-class QPushButton;
-class QRadioButton;
-
-class KComboBox;
-class KActionMenu;
-class KAction;
-class KHistoryCombo;
-class KProgress;
-class KPopupMenu;
-
-class CReadDisplay;
-
-class CModuleResultView : public KListView {
-  Q_OBJECT
-public:
-  CModuleResultView(QWidget* parent);
-  ~CModuleResultView();
-  /**
-  * Setups the tree using the given list of modules.
-  */
-  void setupTree( ListCSwordModuleInfo modules );
-  /**
-  * Returns the currently active module.
-  */
-  CSwordModuleInfo* const activeModule();
-
-protected: // Protected methods
-  /**
-  * Initializes this widget.
-  */
-  void initView();
-  /**
-  * Initializes the connections of this widget
-  */
-  void initConnections();
-
-protected slots: // Protected slots
-  /**
-  * Is executed when an item was selected in the list.
-  */
-  void executed( QListViewItem* );
-  /**
-  * Copies the whole search result with the text into the clipboard.
-  */
-  void copyResultWithText();
-  /**
-  * Copies the whole search result into the clipboard.
-  */
-  void copyResult();
-  /**
-  * This slot opens the popup menu at the given position
-  */
-  void showPopup(KListView*, QListViewItem*, const QPoint&);
-  /**
-  * Appends the whole search result to the printer queue.
-  */
-  void printResult();
-  /**
-  * Saves the search result with it's text.
-  */
-  void saveResultWithText();
-  /**
-  * Saves the search result keys.
-  */
-  void saveResult();
-
-signals:
-  void moduleSelected(CSwordModuleInfo*);
-  void moduleChanged();
-
-private:
-  struct {
-    KActionMenu* saveMenu;
-    struct {
-      KAction* result;
-      KAction* resultWithText;
-    } save;
-    
-    KActionMenu* printMenu;
-    struct {
-      KAction* result;
-    } print;
-    
-    KActionMenu* copyMenu;
-    struct {
-      KAction* result;
-      KAction* resultWithText;
-    } copy;
-    
-  } m_actions;
-  KPopupMenu* m_popup;
-};
-
-class CSearchResultView  : public KListView {
-  Q_OBJECT
-public:
-  CSearchResultView(QWidget* parent);
-  virtual ~CSearchResultView();
-  /** Returns the module which is currently used. */
-  CSwordModuleInfo* const module();
-
-protected: // Protected methods
-  /**
-  * Initializes the view of this widget.
-  */
-  void initView();
-  void initConnections();
-  virtual QDragObject* dragObject();
-  
-public slots: // Public slots
-  void saveItems();
-  /**
-  * Setups the list with the given module.
-  */
-  void setupTree(CSwordModuleInfo*);
-  void copyItemsWithText();
-  void copyItems();
-  void saveItemsWithText();
-  /**
-  * Reimplementation to show the popup menu.
-  */
-  virtual void showPopup(KListView*, QListViewItem* i, const QPoint& point);
-
-protected slots: // Protected slots
-  void printItems();
-  /**
-  * Is connected to the signal executed, which is emitted when a mew item was chosen.
-  */
-  void executed(QListViewItem*);
-
-private:
-  struct {
-    KActionMenu* saveMenu;
-    struct {
-      KAction* result;
-      KAction* resultWithText;
-    } save;
-
-    KActionMenu* printMenu;
-    struct {
-      KAction* result;
-    } print;
-
-    KActionMenu* copyMenu;
-    struct {
-      KAction* result;
-      KAction* resultWithText;
-    } copy;
-  } m_actions;
-  KPopupMenu* m_popup;  
-  CSwordModuleInfo* m_module;
-  
-signals: // Signals
-  void keySelected(const QString&);  
-};
-
-
-/** The page of the search dialog which contains the search result part.
-  * @author The BibleTime team
-  */
-class CSearchResultPage : public QWidget  {
-   Q_OBJECT
-public:
-	CSearchResultPage(QWidget *parent=0, const char *name=0);
-	~CSearchResultPage();
-  /**
-  * Sets the modules which contain the result of each.
-  */
-  void setSearchResult(ListCSwordModuleInfo modules);
-
-public slots: // Public slots
-  /**
-  * Resets the current löist of modules and the displayed list of found entries.
-  */
-  void reset();
-
-protected: // Protected methods
-  /**
-  * Initializes the view of this widget.
-  */
-  void initView();
-  /**
-  * Initializes the signal slot conections of the child widgets
-  */
-  void initConnections();
-  /**
-  * This function highlights the searched text in the content using the search type given by search flags
-  */
-  const QString highlightSearchedText(const QString& content, const QString& searchedText, const int searchFlags);
-
-private:
-  CModuleResultView* m_moduleListBox;
-  CSearchResultView* m_resultListBox;
-  CReadDisplay* m_previewDisplay;
-  ListCSwordModuleInfo m_modules;
-  QPushButton* m_analyseButton;
-
-protected slots: // Protected slots
-  /**
-  * Update the preview of the selected key.
-  */
-  void updatePreview(const QString& key);
-  /**
-  * Shows a dialog with the search analysis of the current search.
-  */
-  void showAnalysis();
-};
-
-class CSearchOptionsPage : public QWidget  {
-   Q_OBJECT
-public:
-	CSearchOptionsPage(QWidget *parent=0, const char *name=0);
-	~CSearchOptionsPage();
-  /**
-  * Sets the search text used in the page.
-  */
-  void setSearchText(const QString& text);
-  /**
-  * Returns the search text set in this page.
-  */
-  const QString searchText();
-  /**
-  * Returns the list of used modules.
-  */
-  const ListCSwordModuleInfo modules();
-  /**
-  * Prepares the stuff which is required for a search, e.g. setting back the percentage bars.
-  */
-  void prepareSearch();
-  /**
-  * Return the selected search type,.
-  */
-  const int searchFlags();
-  /**
-  * Sets all options back to the default.
-  */
-  void reset();
-  /**
-  * Returns the selected search scope if a search scope was selected.
-  */
-  sword::ListKey searchScope();
-  /**
-  * Returns the selected scope type.
-  */
-  const CSwordModuleSearch::scopeType scopeType();
-
-private:
-  QLabel* m_modulesLabel;
-  KHistoryCombo* m_searchTextCombo;
-  QPushButton* m_chooseModulesButton;
-  ListCSwordModuleInfo m_modules;
-
-  KComboBox* m_rangeChooserCombo;
-  QPushButton* m_chooseRangeButton;
-  QRadioButton* m_multipleWordsRadio;
-  QRadioButton* m_exactTextRadio;
-  QRadioButton* m_regexpRadio;
-  QRadioButton* m_multipleWordsORRadio;
-  QCheckBox* m_caseSensitiveBox;
-  KProgress* m_currentProgressBar;
-  KProgress* m_overallProgressBar;
-
-protected: // Protected methods
-  /**
-  * Initializes this page.
-  */
-  void initView();
-  /**
-  * Reads the settings of the last searchdialog session.
-  */
-  void readSettings();
-  /**
-  * Reads the settings for the searchdialog from disk.
-  */
-  void saveSettings();
-
-public slots: // Public slots
-  /**
-  * Sets the modules used by the search.
-  */
-  void setModules( ListCSwordModuleInfo modules );
-  /**
-  * Sets the progress for the "all modules" bar.
-  */
-  void setOverallProgress( const int );
-  /**
-  * Sets the value for the "curret module" progress bar.
-  */
-  void setCurrentModuleProgress( const int );
-  void aboutToShow();
-  /** refreshes the listof ranges and the range combobox. */
-  void refreshRanges();
-  /**
-   * Opens the modules chooser dialog.
-   */
-  void chooseModules();
-  
-protected slots: // Protected slots  
-  void setupRanges();
-};
-
-#endif
diff --git a/bibletime/main.cpp b/bibletime/main.cpp
deleted file mode 100644
index e3a13f5..0000000
--- a/bibletime/main.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-/***************************************************************************
-                          main.cpp  -  The file containing main ;-)
-                             -------------------
-    begin                : Mit Jan 19 12:57:15 CET 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   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.                                   *
-*                                                                         *
-***************************************************************************/
-
-	
-/* $Header: /cvsroot/bibletime/bibletime/bibletime/main.cpp,v 1.103 2004/01/05 12:43:55 joachim Exp $ */
-/* $Revision: 1.103 $ */
-
-//standard includes
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-
-//own includes
-#include "bibletimeapp.h"
-#include "bibletime.h"
-#include "config.h"
-
-//util includes
-#include "util/scoped_resource.h"
-#include "util/cresmgr.h"
-
-//frontend includes
-#include "frontend/kstartuplogo.h"
-#include "frontend/cbtconfig.h"
-
-//Qt includes
-#include <qdir.h>
-
-//KDE includes
-#include <kcmdlineargs.h>
-#include <kcrash.h>
-#include <kglobal.h>
-#include <kapplication.h>
-#include <kstandarddirs.h>
-#include <kinstance.h>
-#include <kaboutdata.h>
-#include <klocale.h>
-
-#include <kmessagebox.h>
-
-bool showDebugMessages = false;
-BibleTime* bibletime_ptr = 0;
-
-void myMessageOutput( QtMsgType type, const char *msg ) {	
-	//we use this messagehandler to switch debugging off in final releases
-	switch ( type ) {
-		case QtDebugMsg:
-			if (showDebugMessages)	//only show messages if they are enabled!
-				fprintf( stderr,"(BibleTime %s) Debug: %s\n",VERSION, msg );
-			break;
-		case QtWarningMsg:
-			//if (showDebugMessages) //comment out for releases so users don't get our debug warnings
-				fprintf( stderr,"(BibleTime %s) WARNING: %s\n",VERSION, msg );
-			break;
-		case QtFatalMsg:
-			fprintf( stderr,"(BibleTime %s) _FATAL_: %s\nPlease contact info@bibletime.de and report this bug!",VERSION, msg );
-			abort();	// dump core on purpose
-	}
-}
-
-extern "C" {
-	static void setSignalHandler(void (*handler)(int));
-
-	// Crash recovery signal handler
-	static void signalHandler(int sigId) {
-		setSignalHandler(SIG_DFL);
-		fprintf(stderr, "*** BibleTime got signal %d (Exiting)\n", sigId);
-		// try to cleanup all windows
-    if (CBTConfig::get(CBTConfig::crashedLastTime)) {
-      //crashed this time and the execution before this one, probably a bug which occurs every time
-      CBTConfig::set(CBTConfig::crashedTwoTimes, true);
-    }
-    else {
-      //try to restore next time.
-      CBTConfig::set(CBTConfig::crashedLastTime, true);
-    }
-    if (bibletime_ptr) {
-      bibletime_ptr->saveSettings();
-			fprintf(stderr, "*** Saving seemed to be succesful. If restoring does not work on next startup \
-please use the option --ignore-session\n");
-		}
-		::exit(-1); //exit BibleTime
-	}
-
-	// Crash recovery signal handler
-	static void crashHandler(int sigId) {
-		setSignalHandler(SIG_DFL);
-		fprintf(stderr, "*** BibleTime got signal %d (Crashing). Trying to save settings.\n", sigId);
-    if (CBTConfig::get(CBTConfig::crashedLastTime)) {
-      //crashed this time and the execution before this one, probably a bug which occurs every time
-      CBTConfig::set(CBTConfig::crashedTwoTimes, true);
-    }
-    else {
-      //try to restore next time.
-      CBTConfig::set(CBTConfig::crashedLastTime, true);
-    }
-    if (bibletime_ptr) {
-			bibletime_ptr->saveSettings();
-			fprintf(stderr, "*** Saving seemed to be succesful. If restoring does not work on next startup \
-please use the option --ignore-session\n");
-		}
-		// Return to DrKonqi.
-	}
-
-	static void setSignalHandler(void (*handler)(int)) {
-		signal(SIGKILL, handler);
-		signal(SIGTERM, handler);
-		signal(SIGHUP,  handler);
-		KCrash::setEmergencySaveFunction(crashHandler);
-	}
-}
-
-int main(int argc, char* argv[]) {
-	qInstallMsgHandler( myMessageOutput );
-
-	//create about data for this application
-	static KCmdLineOptions options[] =
-	{
-		{"debug", I18N_NOOP("Enable debug messages"),0},
-		{"ignore-session", I18N_NOOP("Ignore the startup session that was saved when BibleTime was closed the last time."),0},
-		{"open-default-bible <key>", I18N_NOOP("Open the default bible with the given key. Use <random> to open at a random position."),0},
-		//{"install-local <path>", I18N_NOOP("Open the SwordSetup dialog to install modules from <path>"),0},
-		{0,0,0}
-	};
-
-	KAboutData aboutData(
-		PACKAGE,
-		"BibleTime",
-		VERSION,
-		I18N_NOOP("Bible study tool for KDE"),
-		KAboutData::License_GPL_V2,
-		I18N_NOOP("(c)1999-2003, The BibleTime Team"),
-		I18N_NOOP("BibleTime is an easy to use but powerful Bible study tool for KDE.\n\n\
-We are looking for developers and translators.\n\
-If you'd like to join our team, please send an email to info@bibletime.info."),
-		"http://www.bibletime.info/",
-		"info@bibletime.info"
-	);
-
-  /***********************************************
-  *    Active developers (sorted by last name)   *
-  ************************************************/
-  // Project coordination
-	aboutData.addAuthor("Joachim Ansorg", I18N_NOOP("Project coordinator"),"junkmail@joachim.ansorgs.de","joachim.ansorgs.de");
-  // Second main developer
-	aboutData.addAuthor("Martin Gruner", I18N_NOOP("Frontend, backend"), "mg.pub@gmx.net", "");
-  // and / or search for multiple words, other fixes and improvements
-  aboutData.addAuthor("Nikolay Igotti", I18N_NOOP("Frontend"), "olonho@hotmail.com", "");
-  // comitted search in default bible, opened modules, other smaller things
-  aboutData.addAuthor("Gary Sims", I18N_NOOP("Frontend"), "gary@garysims.co.uk", "");
-	// artwork
-	aboutData.addAuthor("Timothy R. Butler", I18N_NOOP("Icons, startlogo, webpage"), "tbutler@uninetsolutions.com", "www.uninetsolutions.com");
-	aboutData.addAuthor("James Ots", I18N_NOOP("Crystal icons, crystal startlogo, webpage"), "me@jamesots.com", "www.jamesots.com");
-  // documentation
-	aboutData.addAuthor("Fred Saalbach", I18N_NOOP("Documentation"), "saalbach@sybercom.net", "");
-
-  //inactiv
-//	aboutData.addAuthor("Mark Lybarger", 	I18N_NOOP("Searchdialog"), 				"mlybarge@insight.rr.com","");
-//	aboutData.addAuthor("Chris Kujawa", 	I18N_NOOP("Frontend"),"christopher.kujawa@verizon.net", "");
-//	aboutData.addAuthor("Luke Mauldin", 	I18N_NOOP("Frontend"),"lukeskyfly@txk.net", "");
-//	aboutData.addAuthor("Tim Brodie", 	  I18N_NOOP("Installation manager"),"tbrodie@displayworksinc.com", "");
-
-  /***********************************************
-  *        Credits (sorted by last name)         *
-  ************************************************/
-  //Sponsored many years the www.bibletime.de domain!
-  aboutData.addCredit("Thomas Hagedorn",   I18N_NOOP("Sponsored our internet domain for many years"), "tom@theta-consulting.de", "");
-  //He provided us with the Bible Study HowTo
-  aboutData.addCredit("Bob Harman",        I18N_NOOP("Bible Study HowTo"), "ncc@ncchampton.org", "");
-  // Language codes iso639-1, iso639-2 and SIL language codes
-  aboutData.addCredit("SIL International", I18N_NOOP("Language codes and names"), "", "http://www.ethnologue.com/iso639");
-
-//special message so the translator get his credits in the about box, don't remove this!
-  QString dummy = I18N_NOOP("_: NAME OF TRANSLATORS\nYour names"); //translator's name
-  dummy = I18N_NOOP("_: EMAIL OF TRANSLATORS\nYour emails"); //translators eMail
-
-	KCmdLineArgs::init(argc, argv, &aboutData);
-	KCmdLineArgs::addCmdLineOptions( options );
-
-	BibleTimeApp app;
-	KGlobal::dirs()->addResourceType("BT_pic", "share/apps/bibletime/pics/");
-
-	KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
-	// A binary option (on / off)
-	if (args->isSet("debug")) {
-		showDebugMessages = true;
-  }
-
-  //since we don't support session management at the moment we disable this. Only leads to troubles.
-/*
-  if (kapp->isRestored()){
-		for(int n = 1; KMainWindow::canBeRestored(n); n++) {
-			(new BibleTime)->restore(n);
-    }
-
-    RESTORE( BibleTime )
-  }
-	else {
-*/
-		const bool showIt = CBTConfig::get(CBTConfig::logo);
-
-		if(showIt) {
-			KStartupLogo::createSplash();
-			KStartupLogo::showSplash();
-			KStartupLogo::setStatusMessage( i18n("Starting BibleTime") + QString::fromLatin1("...") );
-		}
-
-    setSignalHandler(signalHandler);
-
-    //compatibility stuff for 1.3, needs to be moved to better place later
-		if (CBTConfig::get(CBTConfig::bibletimeVersion) != VERSION) {
-      KStandardDirs stdDirs;
-      QDir dir(stdDirs.saveLocation("data", "bibletime/"));
-      if (!dir.exists("sessions/") && dir.exists("profiles/")) { //only old dir exists
-        dir.rename("profiles", "sessions");
-      }
-    }
-
-		util::scoped_ptr<BibleTime> bibletime( new BibleTime() );
-		bibletime_ptr = bibletime.get();
-
-		// a new BibleTime version was installed (maybe a completely new installation)
-		if (CBTConfig::get(CBTConfig::bibletimeVersion) != VERSION) {
-      KStartupLogo::hideSplash();
-
-      CBTConfig::set(CBTConfig::bibletimeVersion, VERSION);
-			bibletime->slotSettingsOptions();
-		}
-
-		//The tip of the day
-		if (CBTConfig::get(CBTConfig::tips)) {
-      KStartupLogo::hideSplash();
-			bibletime->slotHelpTipOfDay();
-    }
-
-    // restore the workspace and process command line options
-    app.setMainWidget(bibletime);
-    bibletime->show();
-    bibletime->processCommandline(); //must be done after the bibletime window is visible
-
-    if (showIt) {
-			KStartupLogo::hideSplash();
-			KStartupLogo::deleteSplash();
-		}
-
-    return app.exec();
-//	}
-}
-
diff --git a/bibletime/pics/16x16/Makefile.am b/bibletime/pics/16x16/Makefile.am
deleted file mode 100644
index 59dce74..0000000
--- a/bibletime/pics/16x16/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = hi16-action-bt_book.png hi16-action-bt_bible.png hi16-action-bt_book_add.png hi16-action-bt_cascade_auto.png hi16-action-bt_cascade.png hi16-action-bt_commentary_add.png hi16-action-bt_commentary_locked.png hi16-action-bt_displayconfig.png hi16-action-bt_commentary.png hi16-action-bt_displaytranslit.png hi16-action-bt_lexicon_add.png hi16-action-bt_lexicon_locked.png hi16-action-bt_startconfig.png hi16-action-bt_lexicon.png hi16-action-bt_swordconfig.png hi16-action-bt_sync.png hi16-action-bt_tile_auto.png hi16-action-bt_tile.png hi16-app-bibletime.png hi16-action-bt_bible_add.png hi16-action-bt_bible_locked.png hi16-action-bt_book_locked.png
-
-KDE_ICON = bt_book bt_bible bt_book_add bt_cascade_auto bt_cascade bt_commentary_add bt_commentary_locked bt_displayconfig bt_commentary bt_displaytranslit bt_lexicon_add bt_lexicon_locked bt_startconfig bt_lexicon bt_swordconfig bt_sync bt_tile_auto bt_tile bibletime bt_bible_add bt_bible_locked bt_book_locked
\ No newline at end of file
diff --git a/bibletime/pics/16x16/Makefile.in b/bibletime/pics/16x16/Makefile.in
deleted file mode 100644
index 4bd05a2..0000000
--- a/bibletime/pics/16x16/Makefile.in
+++ /dev/null
@@ -1,550 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = hi16-action-bt_book.png hi16-action-bt_bible.png hi16-action-bt_book_add.png hi16-action-bt_cascade_auto.png hi16-action-bt_cascade.png hi16-action-bt_commentary_add.png hi16-action-bt_commentary_locked.png hi16-action-bt_displayconfig.png hi16-action-bt_commentary.png hi16-action-bt_displaytranslit.png hi16-action-bt_lexicon_add.png hi16-action-bt_lexicon_locked.png hi16-action-bt_startconfig.png hi16-action-bt_lexicon.png hi16-action-bt_swordconfig.png hi16-action-bt_sync.png hi16-action-bt_tile_auto.png hi16-action-bt_tile.png hi16-app-bibletime.png hi16-action-bt_bible_add.png hi16-action-bt_bible_locked.png hi16-action-bt_book_locked.png
-
-KDE_ICON = bt_book bt_bible bt_book_add bt_cascade_auto bt_cascade bt_commentary_add bt_commentary_locked bt_displayconfig bt_commentary bt_displaytranslit bt_lexicon_add bt_lexicon_locked bt_startconfig bt_lexicon bt_swordconfig bt_sync bt_tile_auto bt_tile bibletime bt_bible_add bt_bible_locked bt_book_locked
-subdir = bibletime/pics/16x16
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/pics/16x16/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/16x16/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/16x16/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-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:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-#>- uninstall-am: uninstall-info-am
-#>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-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.
-.NOEXPORT:
-
-#>+ 2
-docs-am:
-
-#>+ 50
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_book.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_book_add.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_add.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade_auto.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_commentary_add.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary_add.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_displayconfig.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_displayconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_displaytranslit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_displaytranslit.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_lexicon_add.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon_add.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_startconfig.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_startconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_swordconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_sync.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_sync.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile_auto.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-	$(INSTALL_DATA) $(srcdir)/hi16-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/bibletime.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_bible_add.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible_add.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi16-action-bt_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_locked.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_cascade.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_displayconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_commentary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_displaytranslit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_startconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_lexicon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_swordconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_sync.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/bibletime.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_bible_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/actions/bt_book_locked.png
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/16x16/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/16x16/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/pics/16x16/hi16-action-bt_bible.png b/bibletime/pics/16x16/hi16-action-bt_bible.png
deleted file mode 100644
index 59e09c2..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_bible.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_bible_add.png b/bibletime/pics/16x16/hi16-action-bt_bible_add.png
deleted file mode 100644
index a90a655..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_bible_add.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_bible_locked.png b/bibletime/pics/16x16/hi16-action-bt_bible_locked.png
deleted file mode 100644
index 060626f..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_bible_locked.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_book.png b/bibletime/pics/16x16/hi16-action-bt_book.png
deleted file mode 100644
index 0ec5e3b..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_book.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_book_add.png b/bibletime/pics/16x16/hi16-action-bt_book_add.png
deleted file mode 100644
index ac5fb3f..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_book_add.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_book_locked.png b/bibletime/pics/16x16/hi16-action-bt_book_locked.png
deleted file mode 100644
index 83784a8..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_book_locked.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_cascade.png b/bibletime/pics/16x16/hi16-action-bt_cascade.png
deleted file mode 100644
index d2d4002..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_cascade_auto.png b/bibletime/pics/16x16/hi16-action-bt_cascade_auto.png
deleted file mode 100644
index a16ad9a..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_commentary.png b/bibletime/pics/16x16/hi16-action-bt_commentary.png
deleted file mode 100644
index b9f198e..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_commentary.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_commentary_add.png b/bibletime/pics/16x16/hi16-action-bt_commentary_add.png
deleted file mode 100644
index af1e044..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_commentary_add.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_commentary_locked.png b/bibletime/pics/16x16/hi16-action-bt_commentary_locked.png
deleted file mode 100644
index 9b019dc..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_commentary_locked.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_displayconfig.png b/bibletime/pics/16x16/hi16-action-bt_displayconfig.png
deleted file mode 100755
index 735af2f..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_displayconfig.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_displaytranslit.png b/bibletime/pics/16x16/hi16-action-bt_displaytranslit.png
deleted file mode 100644
index 85c7e98..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_displaytranslit.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_lexicon.png b/bibletime/pics/16x16/hi16-action-bt_lexicon.png
deleted file mode 100644
index 4a0fe15..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_lexicon.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_lexicon_add.png b/bibletime/pics/16x16/hi16-action-bt_lexicon_add.png
deleted file mode 100644
index 78a0ba2..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_lexicon_add.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_lexicon_locked.png b/bibletime/pics/16x16/hi16-action-bt_lexicon_locked.png
deleted file mode 100644
index ff7d87f..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_lexicon_locked.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_startconfig.png b/bibletime/pics/16x16/hi16-action-bt_startconfig.png
deleted file mode 100644
index 21e4865..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_startconfig.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_swordconfig.png b/bibletime/pics/16x16/hi16-action-bt_swordconfig.png
deleted file mode 100644
index 3c33de6..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_swordconfig.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_sync.png b/bibletime/pics/16x16/hi16-action-bt_sync.png
deleted file mode 100644
index 6820542..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_sync.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_tile.png b/bibletime/pics/16x16/hi16-action-bt_tile.png
deleted file mode 100644
index 10854d8..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-action-bt_tile_auto.png b/bibletime/pics/16x16/hi16-action-bt_tile_auto.png
deleted file mode 100644
index f4ab245..0000000
--- a/bibletime/pics/16x16/hi16-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/16x16/hi16-app-bibletime.png b/bibletime/pics/16x16/hi16-app-bibletime.png
deleted file mode 100644
index 1fe6a4d..0000000
--- a/bibletime/pics/16x16/hi16-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/Makefile.am b/bibletime/pics/22x22/Makefile.am
deleted file mode 100644
index 7b920ef..0000000
--- a/bibletime/pics/22x22/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = hi22-action-bt_bible.png hi22-action-bt_bible_add.png hi22-action-bt_bible_locked.png hi22-action-bt_book.png hi22-action-bt_book_add.png hi22-action-bt_book_locked.png hi22-action-bt_cascade.png hi22-action-bt_cascade_auto.png hi22-action-bt_commentary.png hi22-action-bt_commentary_add.png hi22-action-bt_commentary_locked.png hi22-action-bt_displayconfig.png hi22-action-bt_displaytranslit.png hi22-action-bt_lexicon.png hi22-action-bt_lexicon_add.png hi22-action-bt_lexicon_locked.png hi22-action-bt_parallel.png hi22-action-bt_startconfig.png hi22-action-bt_swordconfig.png hi22-action-bt_sync.png hi22-action-bt_tile.png hi22-action-bt_tile_auto.png hi22-app-bibletime.png
-
-KDE_ICON = bt_bible bt_bible_add bt_bible_locked bt_book bt_book_add bt_book_locked bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_commentary_locked bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_lexicon_locked bt_parallel bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime
\ No newline at end of file
diff --git a/bibletime/pics/22x22/Makefile.in b/bibletime/pics/22x22/Makefile.in
deleted file mode 100644
index 62502d2..0000000
--- a/bibletime/pics/22x22/Makefile.in
+++ /dev/null
@@ -1,552 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = hi22-action-bt_bible.png hi22-action-bt_bible_add.png hi22-action-bt_bible_locked.png hi22-action-bt_book.png hi22-action-bt_book_add.png hi22-action-bt_book_locked.png hi22-action-bt_cascade.png hi22-action-bt_cascade_auto.png hi22-action-bt_commentary.png hi22-action-bt_commentary_add.png hi22-action-bt_commentary_locked.png hi22-action-bt_displayconfig.png hi22-action-bt_displaytranslit.png hi22-action-bt_lexicon.png hi22-action-bt_lexicon_add.png hi22-action-bt_lexicon_locked.png hi22-action-bt_parallel.png hi22-action-bt_startconfig.png hi22-action-bt_swordconfig.png hi22-action-bt_sync.png hi22-action-bt_tile.png hi22-action-bt_tile_auto.png hi22-app-bibletime.png
-
-KDE_ICON = bt_bible bt_bible_add bt_bible_locked bt_book bt_book_add bt_book_locked bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_commentary_locked bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_lexicon_locked bt_parallel bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime
-subdir = bibletime/pics/22x22
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/pics/22x22/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/22x22/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/22x22/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-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:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-#>- uninstall-am: uninstall-info-am
-#>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-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.
-.NOEXPORT:
-
-#>+ 2
-docs-am:
-
-#>+ 52
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_bible_add.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible_add.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_book.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_book_add.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book_add.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_cascade.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_cascade_auto.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_commentary_add.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary_add.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_displayconfig.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_displayconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_displaytranslit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_displaytranslit.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_lexicon_add.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon_add.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_parallel.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_parallel.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_startconfig.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_startconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_swordconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_sync.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_sync.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_tile.png
-	$(INSTALL_DATA) $(srcdir)/hi22-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_tile_auto.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-	$(INSTALL_DATA) $(srcdir)/hi22-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/bibletime.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_bible_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_book_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_cascade.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_cascade_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_commentary_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_displayconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_displaytranslit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_lexicon_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_parallel.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_startconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_swordconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_sync.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/actions/bt_tile_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/bibletime.png
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/22x22/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/22x22/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/pics/22x22/hi22-action-bt_bible.png b/bibletime/pics/22x22/hi22-action-bt_bible.png
deleted file mode 100644
index 20c9785..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_bible.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_bible_add.png b/bibletime/pics/22x22/hi22-action-bt_bible_add.png
deleted file mode 100644
index 7684364..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_bible_add.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_bible_locked.png b/bibletime/pics/22x22/hi22-action-bt_bible_locked.png
deleted file mode 100644
index c88f9f7..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_bible_locked.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_book.png b/bibletime/pics/22x22/hi22-action-bt_book.png
deleted file mode 100644
index 7d50365..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_book.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_book_add.png b/bibletime/pics/22x22/hi22-action-bt_book_add.png
deleted file mode 100644
index 60d345f..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_book_add.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_book_locked.png b/bibletime/pics/22x22/hi22-action-bt_book_locked.png
deleted file mode 100644
index 8c0861a..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_book_locked.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_cascade.png b/bibletime/pics/22x22/hi22-action-bt_cascade.png
deleted file mode 100644
index 07068c6..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_cascade_auto.png b/bibletime/pics/22x22/hi22-action-bt_cascade_auto.png
deleted file mode 100644
index 8b3a0a8..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_commentary.png b/bibletime/pics/22x22/hi22-action-bt_commentary.png
deleted file mode 100644
index 4711ca2..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_commentary.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_commentary_add.png b/bibletime/pics/22x22/hi22-action-bt_commentary_add.png
deleted file mode 100644
index d58bb17..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_commentary_add.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_commentary_locked.png b/bibletime/pics/22x22/hi22-action-bt_commentary_locked.png
deleted file mode 100644
index b9b3615..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_commentary_locked.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_displayconfig.png b/bibletime/pics/22x22/hi22-action-bt_displayconfig.png
deleted file mode 100755
index eaa67d1..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_displayconfig.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_displaytranslit.png b/bibletime/pics/22x22/hi22-action-bt_displaytranslit.png
deleted file mode 100644
index 5eada70..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_displaytranslit.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_lexicon.png b/bibletime/pics/22x22/hi22-action-bt_lexicon.png
deleted file mode 100644
index 437cb50..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_lexicon.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_lexicon_add.png b/bibletime/pics/22x22/hi22-action-bt_lexicon_add.png
deleted file mode 100644
index 924ea64..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_lexicon_add.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_lexicon_locked.png b/bibletime/pics/22x22/hi22-action-bt_lexicon_locked.png
deleted file mode 100644
index 0b3fa30..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_lexicon_locked.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_parallel.png b/bibletime/pics/22x22/hi22-action-bt_parallel.png
deleted file mode 100644
index b1d3ea1..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_parallel.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_startconfig.png b/bibletime/pics/22x22/hi22-action-bt_startconfig.png
deleted file mode 100644
index 6f4b900..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_startconfig.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_swordconfig.png b/bibletime/pics/22x22/hi22-action-bt_swordconfig.png
deleted file mode 100644
index 4c87bb5..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_swordconfig.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_sync.png b/bibletime/pics/22x22/hi22-action-bt_sync.png
deleted file mode 100644
index 71f6df7..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_sync.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_tile.png b/bibletime/pics/22x22/hi22-action-bt_tile.png
deleted file mode 100644
index 01d406d..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-action-bt_tile_auto.png b/bibletime/pics/22x22/hi22-action-bt_tile_auto.png
deleted file mode 100644
index e826540..0000000
--- a/bibletime/pics/22x22/hi22-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/22x22/hi22-app-bibletime.png b/bibletime/pics/22x22/hi22-app-bibletime.png
deleted file mode 100644
index acf2585..0000000
--- a/bibletime/pics/22x22/hi22-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/Makefile.am b/bibletime/pics/32x32/Makefile.am
deleted file mode 100644
index 1de62e7..0000000
--- a/bibletime/pics/32x32/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = hi32-action-bt_book_locked.png hi32-action-bt_commentary_locked.png hi32-action-bt_lexicon_locked.png hi32-action-bt_bible.png hi32-action-bt_bible_add.png hi32-action-bt_book.png hi32-action-bt_book_add.png hi32-action-bt_cascade.png hi32-action-bt_cascade_auto.png hi32-action-bt_commentary.png hi32-action-bt_commentary_add.png hi32-action-bt_displayconfig.png hi32-action-bt_displaytranslit.png hi32-action-bt_lexicon.png hi32-action-bt_lexicon_add.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_sync.png hi32-action-bt_tile.png hi32-action-bt_tile_auto.png hi32-app-bibletime.png hi32-action-bt_bible_locked.png
-
-KDE_ICON = bt_book_locked bt_commentary_locked bt_lexicon_locked bt_bible bt_bible_add bt_book bt_book_add bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_bible_locked
\ No newline at end of file
diff --git a/bibletime/pics/32x32/Makefile.in b/bibletime/pics/32x32/Makefile.in
deleted file mode 100644
index 5cf523e..0000000
--- a/bibletime/pics/32x32/Makefile.in
+++ /dev/null
@@ -1,550 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = hi32-action-bt_book_locked.png hi32-action-bt_commentary_locked.png hi32-action-bt_lexicon_locked.png hi32-action-bt_bible.png hi32-action-bt_bible_add.png hi32-action-bt_book.png hi32-action-bt_book_add.png hi32-action-bt_cascade.png hi32-action-bt_cascade_auto.png hi32-action-bt_commentary.png hi32-action-bt_commentary_add.png hi32-action-bt_displayconfig.png hi32-action-bt_displaytranslit.png hi32-action-bt_lexicon.png hi32-action-bt_lexicon_add.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_sync.png hi32-action-bt_tile.png hi32-action-bt_tile_auto.png hi32-app-bibletime.png hi32-action-bt_bible_locked.png
-
-KDE_ICON = bt_book_locked bt_commentary_locked bt_lexicon_locked bt_bible bt_bible_add bt_book bt_book_add bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_bible_locked
-subdir = bibletime/pics/32x32
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/pics/32x32/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/32x32/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/32x32/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-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:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-#>- uninstall-am: uninstall-info-am
-#>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-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.
-.NOEXPORT:
-
-#>+ 2
-docs-am:
-
-#>+ 50
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_bible_add.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible_add.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_book.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_book_add.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book_add.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_cascade.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_cascade_auto.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_commentary_add.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary_add.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_displayconfig.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_displayconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_displaytranslit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_displaytranslit.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_lexicon_add.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon_add.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_startconfig.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_startconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_swordconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_sync.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_sync.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile_auto.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-	$(INSTALL_DATA) $(srcdir)/hi32-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/bibletime.png
-	$(INSTALL_DATA) $(srcdir)/hi32-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible_locked.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_book_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_cascade.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_cascade_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_commentary_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_displayconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_displaytranslit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_lexicon_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_startconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_swordconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_sync.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_tile_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/bibletime.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/actions/bt_bible_locked.png
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/32x32/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/32x32/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/pics/32x32/hi32-action-bt_bible.png b/bibletime/pics/32x32/hi32-action-bt_bible.png
deleted file mode 100644
index b949de7..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_bible.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_bible_add.png b/bibletime/pics/32x32/hi32-action-bt_bible_add.png
deleted file mode 100644
index 48c63e8..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_bible_add.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_bible_locked.png b/bibletime/pics/32x32/hi32-action-bt_bible_locked.png
deleted file mode 100644
index 259e08f..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_bible_locked.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_book.png b/bibletime/pics/32x32/hi32-action-bt_book.png
deleted file mode 100644
index 84887db..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_book.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_book_add.png b/bibletime/pics/32x32/hi32-action-bt_book_add.png
deleted file mode 100644
index 8d35be9..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_book_add.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_book_locked.png b/bibletime/pics/32x32/hi32-action-bt_book_locked.png
deleted file mode 100644
index ce746b8..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_book_locked.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_cascade.png b/bibletime/pics/32x32/hi32-action-bt_cascade.png
deleted file mode 100644
index 070f5d1..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_cascade_auto.png b/bibletime/pics/32x32/hi32-action-bt_cascade_auto.png
deleted file mode 100644
index 4171ffc..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_commentary.png b/bibletime/pics/32x32/hi32-action-bt_commentary.png
deleted file mode 100644
index fa29810..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_commentary.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_commentary_add.png b/bibletime/pics/32x32/hi32-action-bt_commentary_add.png
deleted file mode 100644
index 18b31a8..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_commentary_add.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_commentary_locked.png b/bibletime/pics/32x32/hi32-action-bt_commentary_locked.png
deleted file mode 100644
index f615a88..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_commentary_locked.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_displayconfig.png b/bibletime/pics/32x32/hi32-action-bt_displayconfig.png
deleted file mode 100755
index 2478bf9..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_displayconfig.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_displaytranslit.png b/bibletime/pics/32x32/hi32-action-bt_displaytranslit.png
deleted file mode 100644
index 91f97a2..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_displaytranslit.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_lexicon.png b/bibletime/pics/32x32/hi32-action-bt_lexicon.png
deleted file mode 100644
index 0357308..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_lexicon.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_lexicon_add.png b/bibletime/pics/32x32/hi32-action-bt_lexicon_add.png
deleted file mode 100644
index 9c8ad16..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_lexicon_add.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_lexicon_locked.png b/bibletime/pics/32x32/hi32-action-bt_lexicon_locked.png
deleted file mode 100644
index e239f7f..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_lexicon_locked.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_startconfig.png b/bibletime/pics/32x32/hi32-action-bt_startconfig.png
deleted file mode 100644
index c64200d..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_startconfig.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_swordconfig.png b/bibletime/pics/32x32/hi32-action-bt_swordconfig.png
deleted file mode 100644
index b8f3d30..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_swordconfig.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_sync.png b/bibletime/pics/32x32/hi32-action-bt_sync.png
deleted file mode 100644
index 25fdb0f..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_sync.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_tile.png b/bibletime/pics/32x32/hi32-action-bt_tile.png
deleted file mode 100644
index 3cab67e..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-action-bt_tile_auto.png b/bibletime/pics/32x32/hi32-action-bt_tile_auto.png
deleted file mode 100644
index e92e26d..0000000
--- a/bibletime/pics/32x32/hi32-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/32x32/hi32-app-bibletime.png b/bibletime/pics/32x32/hi32-app-bibletime.png
deleted file mode 100644
index 7dcbc90..0000000
--- a/bibletime/pics/32x32/hi32-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/Makefile.am b/bibletime/pics/48x48/Makefile.am
deleted file mode 100644
index fc06707..0000000
--- a/bibletime/pics/48x48/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = hi48-action-bt_book_locked.png hi48-action-bt_commentary_locked.png hi48-action-bt_lexicon_locked.png hi48-action-bt_bible.png hi48-action-bt_bible_add.png hi48-action-bt_book.png hi48-action-bt_book_add.png hi48-action-bt_cascade.png hi48-action-bt_cascade_auto.png hi48-action-bt_commentary.png hi48-action-bt_commentary_add.png hi48-action-bt_displayconfig.png hi48-action-bt_displaytranslit.png hi48-action-bt_lexicon.png hi48-action-bt_lexicon_add.png hi48-action-bt_startconfig.png hi48-action-bt_swordconfig.png hi48-action-bt_sync.png hi48-action-bt_tile.png hi48-action-bt_tile_auto.png hi48-app-bibletime.png hi48-action-bt_bible_locked.png
-
-KDE_ICON = bt_book_locked bt_commentary_locked bt_lexicon_locked bt_bible bt_bible_add bt_book bt_book_add bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_bible_locked
\ No newline at end of file
diff --git a/bibletime/pics/48x48/Makefile.in b/bibletime/pics/48x48/Makefile.in
deleted file mode 100644
index ee72a31..0000000
--- a/bibletime/pics/48x48/Makefile.in
+++ /dev/null
@@ -1,550 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = hi48-action-bt_book_locked.png hi48-action-bt_commentary_locked.png hi48-action-bt_lexicon_locked.png hi48-action-bt_bible.png hi48-action-bt_bible_add.png hi48-action-bt_book.png hi48-action-bt_book_add.png hi48-action-bt_cascade.png hi48-action-bt_cascade_auto.png hi48-action-bt_commentary.png hi48-action-bt_commentary_add.png hi48-action-bt_displayconfig.png hi48-action-bt_displaytranslit.png hi48-action-bt_lexicon.png hi48-action-bt_lexicon_add.png hi48-action-bt_startconfig.png hi48-action-bt_swordconfig.png hi48-action-bt_sync.png hi48-action-bt_tile.png hi48-action-bt_tile_auto.png hi48-app-bibletime.png hi48-action-bt_bible_locked.png
-
-KDE_ICON = bt_book_locked bt_commentary_locked bt_lexicon_locked bt_bible bt_bible_add bt_book bt_book_add bt_cascade bt_cascade_auto bt_commentary bt_commentary_add bt_displayconfig bt_displaytranslit bt_lexicon bt_lexicon_add bt_startconfig bt_swordconfig bt_sync bt_tile bt_tile_auto bibletime bt_bible_locked
-subdir = bibletime/pics/48x48
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/pics/48x48/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/48x48/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/48x48/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-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:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-#>- uninstall-am: uninstall-info-am
-#>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-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.
-.NOEXPORT:
-
-#>+ 2
-docs-am:
-
-#>+ 50
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_book_locked.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_commentary_locked.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_lexicon_locked.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon_locked.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_bible.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_bible_add.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible_add.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_book.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_book_add.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book_add.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_cascade.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_cascade.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_cascade_auto.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_cascade_auto.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_commentary.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_commentary_add.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary_add.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_displayconfig.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_displayconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_displaytranslit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_displaytranslit.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_lexicon.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_lexicon_add.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon_add.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_startconfig.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_startconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_swordconfig.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_swordconfig.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_sync.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_sync.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_tile.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_tile.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_tile_auto.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_tile_auto.png
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-	$(INSTALL_DATA) $(srcdir)/hi48-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/bibletime.png
-	$(INSTALL_DATA) $(srcdir)/hi48-action-bt_bible_locked.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible_locked.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon_locked.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_book_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_cascade.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_cascade_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_commentary_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_displayconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_displaytranslit.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_lexicon_add.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_startconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_swordconfig.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_sync.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_tile.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_tile_auto.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/bibletime.png
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/actions/bt_bible_locked.png
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/48x48/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/48x48/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/pics/48x48/hi48-action-bt_bible.png b/bibletime/pics/48x48/hi48-action-bt_bible.png
deleted file mode 100644
index d813bd7..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_bible.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_bible_add.png b/bibletime/pics/48x48/hi48-action-bt_bible_add.png
deleted file mode 100644
index c16456b..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_bible_add.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_bible_locked.png b/bibletime/pics/48x48/hi48-action-bt_bible_locked.png
deleted file mode 100644
index 1333584..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_bible_locked.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_book.png b/bibletime/pics/48x48/hi48-action-bt_book.png
deleted file mode 100644
index b3f5fb0..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_book.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_book_add.png b/bibletime/pics/48x48/hi48-action-bt_book_add.png
deleted file mode 100644
index 4fe4cd4..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_book_add.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_book_locked.png b/bibletime/pics/48x48/hi48-action-bt_book_locked.png
deleted file mode 100644
index c76f2a0..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_book_locked.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_cascade.png b/bibletime/pics/48x48/hi48-action-bt_cascade.png
deleted file mode 100644
index 0ea1fe8..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_cascade.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_cascade_auto.png b/bibletime/pics/48x48/hi48-action-bt_cascade_auto.png
deleted file mode 100644
index 6dfc9f5..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_commentary.png b/bibletime/pics/48x48/hi48-action-bt_commentary.png
deleted file mode 100644
index 966b0c6..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_commentary.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_commentary_add.png b/bibletime/pics/48x48/hi48-action-bt_commentary_add.png
deleted file mode 100644
index 3fb2cdd..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_commentary_add.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_commentary_locked.png b/bibletime/pics/48x48/hi48-action-bt_commentary_locked.png
deleted file mode 100644
index 8dd23fb..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_commentary_locked.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_displayconfig.png b/bibletime/pics/48x48/hi48-action-bt_displayconfig.png
deleted file mode 100644
index adb2706..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_displayconfig.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_displaytranslit.png b/bibletime/pics/48x48/hi48-action-bt_displaytranslit.png
deleted file mode 100644
index 30384fd..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_displaytranslit.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_lexicon.png b/bibletime/pics/48x48/hi48-action-bt_lexicon.png
deleted file mode 100644
index 623c564..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_lexicon.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_lexicon_add.png b/bibletime/pics/48x48/hi48-action-bt_lexicon_add.png
deleted file mode 100644
index 9d2cfaf..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_lexicon_add.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_lexicon_locked.png b/bibletime/pics/48x48/hi48-action-bt_lexicon_locked.png
deleted file mode 100644
index dbdafbe..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_lexicon_locked.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_startconfig.png b/bibletime/pics/48x48/hi48-action-bt_startconfig.png
deleted file mode 100644
index 805bf8b..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_startconfig.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_swordconfig.png b/bibletime/pics/48x48/hi48-action-bt_swordconfig.png
deleted file mode 100644
index fb518ed..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_swordconfig.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_sync.png b/bibletime/pics/48x48/hi48-action-bt_sync.png
deleted file mode 100644
index 3dcf17a..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_sync.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_tile.png b/bibletime/pics/48x48/hi48-action-bt_tile.png
deleted file mode 100644
index f49a7b4..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_tile.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-action-bt_tile_auto.png b/bibletime/pics/48x48/hi48-action-bt_tile_auto.png
deleted file mode 100644
index 02436d9..0000000
--- a/bibletime/pics/48x48/hi48-action-bt_tile_auto.png
+++ /dev/null
diff --git a/bibletime/pics/48x48/hi48-app-bibletime.png b/bibletime/pics/48x48/hi48-app-bibletime.png
deleted file mode 100644
index 768f3b9..0000000
--- a/bibletime/pics/48x48/hi48-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/64x64/Makefile.am b/bibletime/pics/64x64/Makefile.am
deleted file mode 100644
index 02a3ff1..0000000
--- a/bibletime/pics/64x64/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = hi64-app-bibletime.png
-
-KDE_ICON = bibletime
\ No newline at end of file
diff --git a/bibletime/pics/64x64/Makefile.in b/bibletime/pics/64x64/Makefile.in
deleted file mode 100644
index 2f84515..0000000
--- a/bibletime/pics/64x64/Makefile.in
+++ /dev/null
@@ -1,507 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = hi64-app-bibletime.png
-
-KDE_ICON = bibletime
-subdir = bibletime/pics/64x64
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/pics/64x64/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/64x64/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/64x64/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-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:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-#>- install-data-am:
-#>+ 1
-install-data-am: install-kde-icons 
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-#>- uninstall-am: uninstall-info-am
-#>+ 1
-uninstall-am: uninstall-kde-icons  uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-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.
-.NOEXPORT:
-
-#>+ 2
-docs-am:
-
-#>+ 7
-install-kde-icons:
-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-	$(INSTALL_DATA) $(srcdir)/hi64-app-bibletime.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/bibletime.png
-
-uninstall-kde-icons:
-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/bibletime.png
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/64x64/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/64x64/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/pics/64x64/hi64-app-bibletime.png b/bibletime/pics/64x64/hi64-app-bibletime.png
deleted file mode 100644
index 05b859d..0000000
--- a/bibletime/pics/64x64/hi64-app-bibletime.png
+++ /dev/null
diff --git a/bibletime/pics/Makefile.am b/bibletime/pics/Makefile.am
deleted file mode 100644
index 670547f..0000000
--- a/bibletime/pics/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-SUBDIRS = \
-16x16 \
-22x22 \
-32x32 \
-48x48 \
-64x64 \
-.
-
-BIBLETIME_PICS = \
-startuplogo.png
-
-EXTRA_DIST = $(BIBLETIME_PICS)
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/bibletime/pics/
-	chmod 755 $(DESTDIR)$(kde_datadir)/bibletime/pics/;
-	@for file in $(BIBLETIME_PICS); do \
-		echo Installing $$file; \
-		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-		chmod 644 $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-	done
-
-uninstall-local:
-	@for file in $(BIBLETIME_PICS); do \
-		echo Removing $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-		rm -f $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-	done
diff --git a/bibletime/pics/Makefile.in b/bibletime/pics/Makefile.in
deleted file mode 100644
index 6ea267e..0000000
--- a/bibletime/pics/Makefile.in
+++ /dev/null
@@ -1,677 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-SUBDIRS = \
-16x16 \
-22x22 \
-32x32 \
-48x48 \
-64x64 \
-.
-
-
-BIBLETIME_PICS = \
-startuplogo.png
-
-
-EXTRA_DIST = $(BIBLETIME_PICS)
-subdir = bibletime/pics
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
-#>- 	all-recursive install-data-recursive install-exec-recursive \
-#>- 	installdirs-recursive install-recursive uninstall-recursive \
-#>- 	check-recursive installcheck-recursive
-#>+ 5
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-#>- all: all-recursive
-#>+ 1
-all: docs-am  all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/pics/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-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.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (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.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	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; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	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
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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-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; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	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)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-local \
-	install-data-recursive install-exec install-exec-am \
-	install-exec-recursive install-info install-info-am \
-	install-info-recursive install-man install-recursive \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am installdirs-recursive maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-	tags-recursive uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-local uninstall-recursive
-
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/bibletime/pics/
-	chmod 755 $(DESTDIR)$(kde_datadir)/bibletime/pics/;
-	@for file in $(BIBLETIME_PICS); do \
-		echo Installing $$file; \
-		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-		chmod 644 $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-	done
-
-uninstall-local:
-	@for file in $(BIBLETIME_PICS); do \
-		echo Removing $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-		rm -f $(DESTDIR)$(kde_datadir)/bibletime/pics/$$file; \
-	done
-# 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:
-
-#>+ 2
-KDE_DIST=startuplogo.png gen_am_pics.pl startuplogo.xcf.bz2 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/pics/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/pics/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/pics/gen_am_pics.pl b/bibletime/pics/gen_am_pics.pl
deleted file mode 100644
index f36a474..0000000
--- a/bibletime/pics/gen_am_pics.pl
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/perl -w
-
-use strict;
-
-my $header = << "EOT";
-# This Makefile.am was automatically generated by running "perl bibletime/pics/gen_am_pics.pl"
-# Please do not edit this file but rather run the script to update
-EOT
-
-my @sizes = ("16x16", "22x22", "32x32", "48x48", "64x64");
-
-foreach my $dirname (@sizes) {
-	print "Creating $dirname/Makefile.am ...\n";
-
-	opendir(DIR, "$dirname");
-	my @icons = grep { /^(lo)|(hi)|(cr)/ && -f "$dirname/$_" } readdir(DIR);
-	closedir(DIR);
-
-	open(OUT, ">", "$dirname/Makefile.am");
-	print OUT $header;
-
-	#Add EXTRA_DIST stuff
-	print OUT "\n\nEXTRA_DIST =";
-	foreach my $icon (@icons) {
-		print OUT " $icon";
-	}
-
-
-	# Add KDE_ICON stuff
-	print OUT "\n\nKDE_ICON =";
-	my %inserted_icons;
-	foreach my $icon (@icons) {
-		$icon =~ s/^(?:hi|lo|cr)\d+-(?:action|app|mime|filesys)-(.+?)\.png/$1/;
-		print OUT " $icon" unless (exists $inserted_icons{$icon});
-		$inserted_icons{$icon} = 1;
-	}
-
-	close(OUT);
-}
diff --git a/bibletime/pics/startuplogo.png b/bibletime/pics/startuplogo.png
deleted file mode 100644
index ff7db20..0000000
--- a/bibletime/pics/startuplogo.png
+++ /dev/null
diff --git a/bibletime/pics/startuplogo.xcf.bz2 b/bibletime/pics/startuplogo.xcf.bz2
deleted file mode 100644
index d1e2518..0000000
--- a/bibletime/pics/startuplogo.xcf.bz2
+++ /dev/null
diff --git a/bibletime/printing/Makefile.am b/bibletime/printing/Makefile.am
deleted file mode 100644
index 76e33d5..0000000
--- a/bibletime/printing/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-INCLUDES = $(all_includes)
-
-libprinting_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libprinting.a
-
-libprinting_a_SOURCES = \
-cstylelist.cpp \
-cprintitemlist.cpp \
-cprintitem.cpp \
-cstyle.cpp \
-cstyleeditordialog.cpp \
-cprinter.cpp \
-cprintdialogpages.cpp
-
-
-all_headers =  \
-cstylelist.h \
-cprintitemlist.h \
-cprintitem.h \
-cstyle.h \
-cstyleeditordialog.h \
-cprinter.h \
-cprintdialogpages.h
-
-
-EXTRA_DIST = $(libprinting_a_SOURCES) $(all_headers)
diff --git a/bibletime/printing/Makefile.in b/bibletime/printing/Makefile.in
deleted file mode 100644
index 0806ddb..0000000
--- a/bibletime/printing/Makefile.in
+++ /dev/null
@@ -1,745 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-
-#>- libprinting_a_METASOURCES = AUTO
-
-noinst_LIBRARIES = libprinting.a
-
-libprinting_a_SOURCES = \
-cstylelist.cpp \
-cprintitemlist.cpp \
-cprintitem.cpp \
-cstyle.cpp \
-cstyleeditordialog.cpp \
-cprinter.cpp \
-cprintdialogpages.cpp
-
-
-all_headers = \
-cstylelist.h \
-cprintitemlist.h \
-cprintitem.h \
-cstyle.h \
-cstyleeditordialog.h \
-cprinter.h \
-cprintdialogpages.h
-
-
-EXTRA_DIST = $(libprinting_a_SOURCES) $(all_headers)
-subdir = bibletime/printing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libprinting_a_AR = $(AR) cru
-libprinting_a_LIBADD =
-am_libprinting_a_OBJECTS = cstylelist.$(OBJEXT) cprintitemlist.$(OBJEXT) \
-	cprintitem.$(OBJEXT) cstyle.$(OBJEXT) \
-	cstyleeditordialog.$(OBJEXT) cprinter.$(OBJEXT) \
-	cprintdialogpages.$(OBJEXT)
-#>- libprinting_a_OBJECTS = $(am_libprinting_a_OBJECTS)
-#>+ 8
-libprinting_a_final_OBJECTS = libprinting_a.all_cpp.o 
-libprinting_a_nofinal_OBJECTS = cstylelist.$(OBJEXT) cprintitemlist.$(OBJEXT) \
-	cprintitem.$(OBJEXT) cstyle.$(OBJEXT) \
-	cstyleeditordialog.$(OBJEXT) cprinter.$(OBJEXT) \
-	cprintdialogpages.$(OBJEXT)\
-cstylelist.moc.o cprintitemlist.moc.o cstyleeditordialog.moc.o cprinter.moc.o cprintdialogpages.moc.o 
-@KDE_USE_FINAL_FALSE@libprinting_a_OBJECTS = $(libprinting_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libprinting_a_OBJECTS = $(libprinting_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cprintdialogpages.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cprinter.Po ./$(DEPDIR)/cprintitem.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cprintitemlist.Po ./$(DEPDIR)/cstyle.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cstyleeditordialog.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/cstylelist.Po
-#>+ 10
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =  $(DEPDIR)/cstylelist.moc.P $(DEPDIR)/cprintitemlist.moc.P $(DEPDIR)/cstyleeditordialog.moc.P $(DEPDIR)/cprinter.moc.P $(DEPDIR)/cprintdialogpages.moc.P  $(DEPDIR)/libprinting_a.all_cpp.P ./$(DEPDIR)/cprintdialogpages.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cprinter.Po ./$(DEPDIR)/cprintitem.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cprintitemlist.Po ./$(DEPDIR)/cstyle.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cstyleeditordialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/cstylelist.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  $(DEPDIR)/cstylelist.moc.P $(DEPDIR)/cprintitemlist.moc.P $(DEPDIR)/cstyleeditordialog.moc.P $(DEPDIR)/cprinter.moc.P $(DEPDIR)/cprintdialogpages.moc.P ./$(DEPDIR)/cprintdialogpages.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cprinter.Po ./$(DEPDIR)/cprintitem.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cprintitemlist.Po ./$(DEPDIR)/cstyle.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cstyleeditordialog.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/cstylelist.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libprinting_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libprinting_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/printing/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/printing/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/printing/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libprinting.a: $(libprinting_a_OBJECTS) $(libprinting_a_DEPENDENCIES) 
-	-rm -f libprinting.a
-	$(libprinting_a_AR) libprinting.a $(libprinting_a_OBJECTS) $(libprinting_a_LIBADD)
-	$(RANLIB) libprinting.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprintdialogpages.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprinter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprintitem.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cprintitemlist.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cstyle.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cstyleeditordialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cstylelist.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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:  $(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 "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-metasources clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-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
-
-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-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-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.
-.NOEXPORT:
-
-#>+ 3
-cstylelist.moc.cpp: $(srcdir)/cstylelist.h
-	$(MOC) $(srcdir)/cstylelist.h -o cstylelist.moc.cpp
-
-#>+ 2
-mocs: cstylelist.moc.cpp
-
-#>+ 3
-cprintitemlist.moc.cpp: $(srcdir)/cprintitemlist.h
-	$(MOC) $(srcdir)/cprintitemlist.h -o cprintitemlist.moc.cpp
-
-#>+ 2
-mocs: cprintitemlist.moc.cpp
-
-#>+ 3
-cstyleeditordialog.moc.cpp: $(srcdir)/cstyleeditordialog.h
-	$(MOC) $(srcdir)/cstyleeditordialog.h -o cstyleeditordialog.moc.cpp
-
-#>+ 2
-mocs: cstyleeditordialog.moc.cpp
-
-#>+ 3
-cprinter.moc.cpp: $(srcdir)/cprinter.h
-	$(MOC) $(srcdir)/cprinter.h -o cprinter.moc.cpp
-
-#>+ 2
-mocs: cprinter.moc.cpp
-
-#>+ 3
-cprintdialogpages.moc.cpp: $(srcdir)/cprintdialogpages.h
-	$(MOC) $(srcdir)/cprintdialogpages.h -o cprintdialogpages.moc.cpp
-
-#>+ 2
-mocs: cprintdialogpages.moc.cpp
-
-#>+ 3
-clean-metasources:
-	-rm -f  cstylelist.moc.cpp cprintitemlist.moc.cpp cstyleeditordialog.moc.cpp cprinter.moc.cpp cprintdialogpages.moc.cpp
-
-#>+ 2
-KDE_DIST=cprintdialogpages.h cstylelist.h cprintitem.h cprintitemlist.h cstyle.h cstyleeditordialog.h cprinter.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/printing/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/printing/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libprinting_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cstylelist.cpp $(srcdir)/cprintitemlist.cpp $(srcdir)/cprintitem.cpp $(srcdir)/cstyle.cpp $(srcdir)/cstyleeditordialog.cpp $(srcdir)/cprinter.cpp $(srcdir)/cprintdialogpages.cpp cprintitemlist.moc.cpp cstylelist.moc.cpp cprinter.moc.cpp cstyleeditordialog.moc.cpp cprintdialogpages.moc.cpp 
-	@echo 'creating libprinting_a.all_cpp.cpp ...'; \
-	rm -f libprinting_a.all_cpp.files libprinting_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libprinting_a.all_cpp.final; \
-	for file in cstylelist.cpp cprintitemlist.cpp cprintitem.cpp cstyle.cpp cstyleeditordialog.cpp cprinter.cpp cprintdialogpages.cpp cprintitemlist.moc.cpp cstylelist.moc.cpp cprinter.moc.cpp cstyleeditordialog.moc.cpp cprintdialogpages.moc.cpp ; do \
-	  echo "#include \"$$file\"" >> libprinting_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libprinting_a.all_cpp.final; \
-	done; \
-	cat libprinting_a.all_cpp.final libprinting_a.all_cpp.files > libprinting_a.all_cpp.cpp; \
-	rm -f libprinting_a.all_cpp.final libprinting_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libprinting_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libprinting_a_OBJECTS="$(libprinting_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libprinting_a_OBJECTS="$(libprinting_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libprinting_a_OBJECTS="$(libprinting_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libprinting_a_OBJECTS="$(libprinting_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/printing/cprintdialogpages.cpp b/bibletime/printing/cprintdialogpages.cpp
deleted file mode 100644
index 3602169..0000000
--- a/bibletime/printing/cprintdialogpages.cpp
+++ /dev/null
@@ -1,285 +0,0 @@
-/***************************************************************************
-                          cstylelistpage.cpp  -  description
-                             -------------------
-    begin                : Fri Feb 8 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cprinter.h"
-#include "cprintdialogpages.h"
-#include "cprintitemlist.h"
-#include "cprintitem.h"
-
-#include "util/cresmgr.h"
-
-//QT includes
-#include <qbuttongroup.h>
-#include <qcombobox.h>
-#include <qtoolbutton.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qwhatsthis.h>
-#include <qtooltip.h>
-#include <qspinbox.h>
-#include <qlistview.h>
-#include <qiconset.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kiconloader.h>
-
-CStyleListPage::CStyleListPage(CPrinter* printer, QWidget *parent, const char *name )
-	: KPrintDialogPage(parent,name), m_printer(printer) {
-	setTitle(i18n("Styles"));
-
-//  QFrame *page = addPage( i18n("Layout"), i18n("Layout specific settings") );
-  QVBoxLayout *topLayout = new QVBoxLayout( this, 5, 5 );
-  	
-  QButtonGroup *group = new QButtonGroup( i18n("Margins (mm)"), this );
-  QWhatsThis::add(group, CResMgr::printing::printerSettings::margins::whatsthis);
-  topLayout->addWidget( group, 0 );
-
-  QGridLayout *gbox = new QGridLayout( group, 4, 2, 5, 5 );
-  gbox->addRowSpacing( 0, group->fontMetrics().height()-5 );
-
-  const QString designation[4] = {i18n("&Top"),i18n("&Bottom"),i18n("&Left"), i18n("&Right") };
-  for( int i=0; i<4; i++ ) {
-    m_marginSpin[i] = new QSpinBox( group );
-    m_marginSpin[i]->setFixedHeight( m_marginSpin[i]->sizeHint().height() );
-    m_marginSpin[i]->setMinimumWidth( m_marginSpin[i]->fontMetrics().width("M")*10 );
-    m_marginSpin[i]->setSuffix(" mm");
-
-    QLabel *label = new QLabel( m_marginSpin[i], designation[i], group );
-    label->setFixedHeight( m_marginSpin[i]->sizeHint().height() );
-    label->setFixedWidth( label->sizeHint().width() );
-
-    if( i < 2 )
-    {
-      gbox->addWidget( label, i+1, 0, AlignLeft );
-      gbox->addWidget( m_marginSpin[i], i+1, 1, AlignLeft );
-    }
-    else
-    {
-      gbox->addWidget( label, i-1, 3, AlignLeft );
-      gbox->addWidget( m_marginSpin[i], i-1, 4, AlignLeft );
-    }
-  }
-  QToolTip::add(m_marginSpin[0], CResMgr::printing::printerSettings::margins::upper::tooltip);
-  QToolTip::add(m_marginSpin[1], CResMgr::printing::printerSettings::margins::lower::tooltip);
-  QToolTip::add(m_marginSpin[2], CResMgr::printing::printerSettings::margins::left::tooltip);
-  QToolTip::add(m_marginSpin[3], CResMgr::printing::printerSettings::margins::right::tooltip);
-
-  QWhatsThis::add(m_marginSpin[0], CResMgr::printing::printerSettings::margins::upper::whatsthis);
-  QWhatsThis::add(m_marginSpin[1], CResMgr::printing::printerSettings::margins::lower::whatsthis);
-  QWhatsThis::add(m_marginSpin[2], CResMgr::printing::printerSettings::margins::left::whatsthis);
-  QWhatsThis::add(m_marginSpin[3], CResMgr::printing::printerSettings::margins::right::whatsthis);
-
-
-  gbox->activate();
-  group->setFixedHeight( group->sizeHint().height() );
-  //set minimum borders
-  m_marginSpin[0]->setRange(0, 100);	//upper margin
-  m_marginSpin[1]->setRange(0, 100);	//lower margin
-  m_marginSpin[2]->setRange(0, 100);	//left margin
-  m_marginSpin[3]->setRange(0, 100);	//right margin
-
-  QHBoxLayout *entryLayout = new QHBoxLayout( 0, 5, 5 );
-  QVBoxLayout *styleLayout = new QVBoxLayout( 0, 5, 5 );
-  QVBoxLayout *buttonLayout = new QVBoxLayout( 0, 5, 5 );
-
-  m_styleList = new CStyleList( &(m_printer->styleList()), this, "CStyleList1");
-	connect(m_styleList, SIGNAL(currentChanged(QListViewItem*)), SLOT(currentStyleChanged(QListViewItem*)));
-//	QToolTip::add(m_styleList, TT_PD_LAYOUT_STYLE_LIST);
-//	QWhatsThis::add(m_styleList, WT_PD_LAYOUT_STYLE_LIST);
-
-  QLabel* label = new QLabel(m_styleList, i18n("Available styles:"), this);
-  styleLayout->addWidget(label,0);
-	styleLayout->addWidget( m_styleList, 3);
-
-	m_newStyleButton = new QToolButton( this, "newStyle Button");
-	m_newStyleButton->setIconSet( SmallIcon( CResMgr::printing::styleList::newStyle::icon ) );
-	QToolTip::add(m_newStyleButton, CResMgr::printing::styleList::newStyle::tooltip);
-	QWhatsThis::add(m_newStyleButton, CResMgr::printing::styleList::newStyle::whatsthis);
-	connect( m_newStyleButton, SIGNAL(clicked()), m_styleList, SLOT(createNewStyle()));
-
-	m_deleteStyleButton = new QToolButton( this, "deleteStyle Button");
-	m_deleteStyleButton->setIconSet( SmallIcon(CResMgr::printing::styleList::deleteStyle::icon));
-	QToolTip::add(m_deleteStyleButton, CResMgr::printing::styleList::deleteStyle::tooltip);
-	QWhatsThis::add(m_deleteStyleButton, CResMgr::printing::styleList::deleteStyle::whatsthis);
-	connect( m_deleteStyleButton, SIGNAL(clicked()), m_styleList, SLOT(deleteCurrentStyle()));
-
-	m_editStyleButton = new QToolButton( this, "editStyle");
-	m_editStyleButton->setIconSet( SmallIcon(CResMgr::printing::styleList::editStyle::icon));
-	QToolTip::add(m_editStyleButton, CResMgr::printing::styleList::editStyle::tooltip);
-	QWhatsThis::add(m_editStyleButton, CResMgr::printing::styleList::editStyle::whatsthis);
-	connect( m_editStyleButton, SIGNAL(clicked()), m_styleList, SLOT(editCurrentStyle()));
-		
-	buttonLayout->addWidget( m_newStyleButton );
-	buttonLayout->addWidget( m_editStyleButton );
-	buttonLayout->addWidget( m_deleteStyleButton );
-	buttonLayout->addStretch(3);
-		
-	entryLayout->addLayout( styleLayout );
-	entryLayout->addLayout( buttonLayout );
-	
-	topLayout->addLayout(entryLayout);
-}
-
-CStyleListPage::~CStyleListPage() {
-
-}
-
-void  CStyleListPage::getOptions (QMap<QString, QString>& opts, bool /*incldef*/) {
-//	qWarning("CStyleListPage::getOptions (const QMap<QString,QString>& opts, bool)");
-
-	const QString leading = "kde-bibletime-";
-	opts[ leading+"upper_margin" ] = QString::number(m_marginSpin[0]->value());
-//	qWarning(opts[leading+"upper_margin"].latin1());
-	opts[ leading+"lower_margin" ] = QString::number(m_marginSpin[1]->value());
-	opts[ leading+"left_margin"  ] = QString::number(m_marginSpin[2]->value());
-	opts[ leading+"right_margin" ] = QString::number(m_marginSpin[3]->value());
-}
-
-void  CStyleListPage::setOptions (const QMap<QString,QString>& opts) {
-	qWarning("CStyleListPage::setOptions (const QMap<QString,QString>& opts)");
-
-	const QString leading = "kde-bibletime-";
-	QString option = opts[ leading+"upper_margin" ];
-	m_marginSpin[0]->setValue( option.toInt() );
-	option = opts[ leading+"lower_margin" ];
-	m_marginSpin[1]->setValue( option.toInt() );
-	option = opts[ leading+"left_margin" ];
-	m_marginSpin[2]->setValue( option.toInt() );
-	option = opts[ leading+"right_margin" ];
-	m_marginSpin[3]->setValue( option.toInt() );
-}
-
-bool  CStyleListPage::isValid(QString& /*errorMessage*/) {
-	return true;
-}
-
-/** No descriptions */
-void CStyleListPage::currentStyleChanged( QListViewItem* item ){
-	if (item) {
-		m_deleteStyleButton->setEnabled( item->text(0) != i18n("Standard") );
-		m_editStyleButton->setEnabled( true );	
-	}
-	else {
-		m_deleteStyleButton->setEnabled( false );
-		m_editStyleButton->setEnabled( false );	
-	}
-}
-
-
-
-// ------------------
-
-CPrintItemListPage::CPrintItemListPage(CPrinter* printer, QWidget *parent, const char *name )
-	: KPrintDialogPage(parent,name), m_printer( printer )
-{
-	setTitle(i18n("Print queue"));
-
-  QVBoxLayout *topLayout = new QVBoxLayout( this, 5, 5 );
-  QVBoxLayout *entryLayout = new QVBoxLayout( 0, 5, 5 );
-  QLabel*	label = 0;
-
-  m_styleComboBox = new QComboBox( this, "styleComboBox" );
-	QToolTip::add(m_styleComboBox, CResMgr::printing::itemPage::styleChooser::tooltip);
-	QWhatsThis::add(m_styleComboBox, CResMgr::printing::itemPage::styleChooser::whatsthis);
-  connect(m_styleComboBox, SIGNAL(activated(const QString&)), SLOT(slotListApplyStyle(const QString&)));
-
-  label = new QLabel( m_styleComboBox, i18n("Use style:"), this);
-  QHBoxLayout*	hboxLayout = new QHBoxLayout( 0, 5, 5 );
-  hboxLayout->addWidget( label );
-  hboxLayout->addWidget( m_styleComboBox );
-  topLayout->addLayout( hboxLayout );
-
-  hboxLayout = new QHBoxLayout( 0, 5, 5 );
-
-  m_printItemList = new CPrintItemList( &(m_printer->queue()), this, "CPrintItemList1");
-	QToolTip::add(m_printItemList, CResMgr::printing::itemPage::itemList::tooltip);
-	QWhatsThis::add(m_printItemList, CResMgr::printing::itemPage::itemList::whatsthis);
-
-  label = new QLabel(m_printItemList, i18n("Entries to print:"), this);
-  entryLayout->addWidget(label);
-  entryLayout->addWidget( m_printItemList );
-  hboxLayout->addLayout(entryLayout);
-
-  QVBoxLayout *buttonLayout = new QVBoxLayout( 0, 5, 5 );
-  m_moveUpButton = new QToolButton(this);
- 	m_moveUpButton->setIconSet( SmallIcon(CResMgr::printing::itemPage::itemUp::icon));
-	QToolTip::add(m_moveUpButton, CResMgr::printing::itemPage::itemUp::tooltip);
-	QWhatsThis::add(m_moveUpButton, CResMgr::printing::itemPage::itemUp::whatsthis);	
-	connect(m_moveUpButton, SIGNAL(clicked()),m_printItemList, SLOT(moveUp()));
-	
-  m_moveDownButton = new QToolButton(this);
- 	m_moveDownButton->setIconSet( SmallIcon(CResMgr::printing::itemPage::itemDown::icon));
-	QToolTip::add(m_moveDownButton, CResMgr::printing::itemPage::itemDown::tooltip);
-	QWhatsThis::add(m_moveDownButton, CResMgr::printing::itemPage::itemDown::whatsthis);
-	connect( m_moveDownButton, SIGNAL(clicked()),m_printItemList, SLOT(moveDown()));
-	
-  m_deleteButton = new QToolButton(this);
-	m_deleteButton->setIconSet( SmallIcon(CResMgr::printing::itemPage::itemDelete::icon));
-	QToolTip::add(m_deleteButton, CResMgr::printing::itemPage::itemDelete::tooltip);
-	QWhatsThis::add(m_deleteButton, CResMgr::printing::itemPage::itemDelete::whatsthis);		
-	connect( m_deleteButton, SIGNAL(clicked()),m_printItemList, SLOT(deleteSelectedItems()));
-
-  buttonLayout->addWidget(m_moveUpButton);
-  buttonLayout->addWidget(m_moveDownButton);
-  buttonLayout->addWidget(m_deleteButton);
- 	buttonLayout->addStretch(3);
-
-  hboxLayout->addLayout( buttonLayout );
-  topLayout->addLayout( hboxLayout );
-
-	connect(m_printer, SIGNAL(sigStylesChanged()), this, SLOT(stylesChanged()));
-	stylesChanged(); //fill the box for the first time
-}
-
-CPrintItemListPage::~CPrintItemListPage() {
-
-}
-
-void CPrintItemListPage::getOptions (QMap<QString, QString>& /*opts*/, bool /*incldef*/) {
-
-}
-
-void CPrintItemListPage::setOptions (const QMap<QString,QString>& /*opts*/) {
-
-}
-
-bool CPrintItemListPage::isValid(QString& /*errorMessage*/) {
-	return true;
-}
-
-/** Applies the given styles to the print item list. */
-void CPrintItemListPage::slotListApplyStyle(const QString& styleName ){
-	StyleItemList& styleList = m_printer->styleList();	
-	for(styleList.first(); styleList.current(); styleList.next()) {
-		if (styleList.current()->styleName() == styleName) {
-		 	m_printItemList->applyStyleToSelected( styleList.current() );
-		 	break;
-		}
-	}
-}
-
-/** Is called when the CPrinter object sends a signal that the styles have changed. */
-void CPrintItemListPage::stylesChanged(){
-	m_styleComboBox->clear();
-	//refill the combobox
-	StyleItemList& styleList = m_printer->styleList();	
-	for(styleList.first(); styleList.current(); styleList.next()) {
-		m_styleComboBox->insertItem(styleList.current()->styleName());
-	}	
-}
diff --git a/bibletime/printing/cprintdialogpages.h b/bibletime/printing/cprintdialogpages.h
deleted file mode 100644
index 27bb7c2..0000000
--- a/bibletime/printing/cprintdialogpages.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/***************************************************************************
-                          cstylelistpage.h  -  description
-                             -------------------
-    begin                : Fri Feb 8 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSTYLELISTPAGE_H
-#define CSTYLELISTPAGE_H
-
-//Qt includes
-#include <qwidget.h>
-#include <qtoolbutton.h>
-
-//KDE includes
-#include <kdeprint/kprintdialogpage.h>
-
-
-class QComboBox;
-class QSpinBox;
-class QListViewItem;
-
-class CPrintItemList;
-class CStyleList;
-class CPrinter;
-
-/**
-  *@author The BibleTime team
-  */
-
-class CStyleListPage : public KPrintDialogPage  {
-   Q_OBJECT
-public: 
-	CStyleListPage(CPrinter* printer, QWidget *parent=0, const char *name=0);
-	~CStyleListPage();
-	virtual void  getOptions (QMap<QString,QString>& opts, bool incldef = false);
-	virtual void  setOptions (const QMap<QString,QString>& opts);
-	virtual bool  isValid (QString&);
-
-private:
-	CPrinter* m_printer;
-  QSpinBox *m_marginSpin[4];
-  CStyleList*	m_styleList;		
-  QToolButton* m_deleteStyleButton;		
-  QToolButton* m_newStyleButton;		
-  QToolButton* m_editStyleButton;
-  /**
-  * Is called when the style selection changed in the syle list box.
-  */
-
-private slots:
-  void currentStyleChanged(QListViewItem*);
-};
-
-// --------------------------
-
-/**
-  *@author The BibleTime team
-  */
-
-class CPrintItemListPage : public KPrintDialogPage  {
-   Q_OBJECT
-public:
-	CPrintItemListPage(CPrinter* printer, QWidget *parent=0, const char *name=0);
-	~CPrintItemListPage();
-	virtual void  getOptions (QMap<QString,QString>& opts, bool incldef = false);
-	virtual void  setOptions (const QMap<QString,QString>& opts);
-	virtual bool  isValid (QString&);
-
-private:
-	CPrinter* m_printer;
-	CPrintItemList* m_printItemList;
-	QComboBox* m_styleComboBox;
-	QToolButton* m_moveUpButton;
-	QToolButton* m_moveDownButton;
-	QToolButton* m_deleteButton;		
-
-private slots:
-  /**
- 	* Applies the given styles to the print item list.
- 	*/
-  void slotListApplyStyle(const QString&);
-protected slots: // Protected slots
-  /**
-  * Is called when the CPrinter object sends a signal
-  * that the styles have changed.
-  */
-  void stylesChanged();
-};
-
-
-#endif
diff --git a/bibletime/printing/cprinter.cpp b/bibletime/printing/cprinter.cpp
deleted file mode 100644
index 632e54a..0000000
--- a/bibletime/printing/cprinter.cpp
+++ /dev/null
@@ -1,416 +0,0 @@
-/***************************************************************************
-                          cprinter.cpp  -  description
-                             -------------------
-    begin                : Sat Aug 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cprinter.h"
-#include "cprintitem.h"
-#include "cprintdialogpages.h"
-
-#include "backend/cswordbackend.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordldkey.h"
-
-//KDE includes
-#include <kconfig.h>
-#include <kprocess.h>
-#include <kconfigbase.h>
-#include <kstandarddirs.h>
-#include <klocale.h>
-#include <kapplication.h>
-
-//Qt includes
-#include <qfile.h>
-#include <qdir.h>
-#include <qstringlist.h>
-#include <qpainter.h>
-#include <qpaintdevice.h>
-#include <qpaintdevicemetrics.h>
-
-
-CPrinter::CPrinter( QObject* parent ) : QObject(parent) {
-  m_styleData.standardStyle = QString::fromLatin1(\
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE DOC ><BibleTimePrintingStyle syntaxVersion=\"1\" name=\"%1\">\
- <HEADER alignment=\"0\" enabled=\"1\" >\
-  <COLORS bgcolor=\"#ffffff\" fgcolor=\"#000000\" />\
-  <FONT family=\"\" weight=\"75\" pointsize=\"12\" italic=\"0\" />\
-  <FRAME enabled=\"0\" />\
- </HEADER>\
- <DESCRIPTION alignment=\"0\" enabled=\"1\" >\
-  <COLORS bgcolor=\"#ffffff\" fgcolor=\"#000000\" />\
-  <FONT family=\"\" weight=\"50\" pointsize=\"10\" italic=\"0\" />\
-  <FRAME enabled=\"0\" />\
- </DESCRIPTION>\
- <MODULETEXT alignment=\"0\" enabled=\"1\" >\
-  <COLORS bgcolor=\"#ffffff\" fgcolor=\"#000000\" /> \
-  <FONT family=\"\" weight=\"50\" pointsize=\"10\" italic=\"0\" />\
-  <FRAME enabled=\"0\" />\
- </MODULETEXT>\
-</BibleTimePrintingStyle>").arg(i18n("Standard"));
-
-  m_styleData.bwStyle = QString::fromLatin1(\
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE DOC ><BibleTimePrintingStyle syntaxVersion=\"1\" name=\"%1\" >\
- <HEADER alignment=\"1\" enabled=\"1\" >\
-  <COLORS bgcolor=\"#ffffff\" fgcolor=\"#000000\" />\
-  <FONT family=\"\" weight=\"75\" pointsize=\"12\" italic=\"0\" />\
-  <FRAME thickness=\"1\" style=\"1\" color=\"#000000\" enabled=\"1\" />\
- </HEADER>\
- <DESCRIPTION alignment=\"1\" enabled=\"1\" >\
-  <COLORS bgcolor=\"#ffffff\" fgcolor=\"#000000\" />\
-  <FONT family=\"\" weight=\"50\" pointsize=\"10\" italic=\"1\" />\
-  <FRAME enabled=\"0\" />\
- </DESCRIPTION>\
- <MODULETEXT alignment=\"0\" enabled=\"1\" >\
-  <COLORS bgcolor=\"#ffffff\" fgcolor=\"#000000\" />\
-  <FONT family=\"\" weight=\"50\" pointsize=\"10\" italic=\"0\" />\
-  <FRAME thickness=\"1\" style=\"1\" color=\"#000000\" enabled=\"1\" />\
- </MODULETEXT>\
-</BibleTimePrintingStyle>").arg(i18n("Black&amp;White for larger text portions"));
-
-
-	m_config = new KConfig("bt-printing", false, true );
-
-	m_queue.setAutoDelete(true);			
-	m_styleList.setAutoDelete(true);		
-	m_cachedPage.initialized = false;
-	m_cachedPage.refresh = false;	
-	m_addedItem = false;
-	
-	{
-		KConfigGroupSaver gs(m_config, "Options");	
-		QMap<QString, QString> map = m_config->entryMap("Options");
-		setOptions(map);
-	}
-	
-	m_styleDir = "printing/";
-	KStandardDirs stdDirs;
-	m_styleSaveLocation = stdDirs.saveLocation("data", "bibletime/"+m_styleDir);		
-	
-	readSettings();
-	setupStyles();
-	setupStandardStyle();		
-}
-
-CPrinter::~CPrinter(){
-	saveSettings();
-	saveStyles();	
-	m_config->sync();
-			
-	delete m_config;
-}
-
-/** Appends a new page where the next things will be painted. */
-const bool CPrinter::newPage(){
-	if (aborted()) {
-		qWarning("CPrinter::newPage: Printing was aborted!");
-		return false;
-	}
-	const bool result = KPrinter::newPage();
-	if (result) {
-		m_pagePosition.curPage++;
-	 	m_pagePosition.rect = contentSize();			
-	 	setVerticalPos(pageMargins().top);
-	}
-	return result;
-}
-
-/** Sets all the margins at one time. */
-void CPrinter::setAllMargins( const CPageMargin margins ) {
-	m_cachedPage.refresh = true;	
-	m_pageMargin = margins;
-}
-
-/** Returns the margins of the pages. */
-const CPrinter::CPageMargin& CPrinter::pageMargins() const {
-	return m_pageMargin;
-}
-
-/** Setups the printer using CPrinterDialog. */
-void CPrinter::setup( QWidget* parent ){
-	KPrinter::addDialogPage( new CPrintItemListPage(this) );
-	KPrinter::addDialogPage( new CStyleListPage(this) );
-
-	if ( KPrinter::setup(parent) ) {
-		saveSettings();
-		readSettings();
-		print();
-	}
-}
-
-/** Starts printing the items. */
-void CPrinter::print(){
-  emit printingStarted();
-  
-	QPainter p;
-	if (!p.begin(this)) {
-		p.end();
-		return;
-	}	
-	int lastPercent = 0;
-	int pos = 1;
-	const int count = m_queue.count();
-	const int copies = numCopies();
-	float copyFrac;
-	emit percentCompleted(0);
-	
-	for (int copy = 0; copy < copies && !aborted(); copy++) {	//make numCopies() copies of the pages
-		copyFrac = (float(copies)) / (float)(copy+1);
-    
-		for (m_queue.first(), pos = 1; m_queue.current(); m_queue.next(), ++pos) {
-			KApplication::kApplication()->processEvents(5); //do not lock the GUI!
-			if (!aborted()) {
-				m_queue.current()->draw(&p,this);				
-				if ((int)((float)pos / (float)count *(float)100 * copyFrac) > lastPercent) {
-					emit percentCompleted(++lastPercent);
-        }
-			}
-		};
-		if (!aborted() && (copy+1 < copies) ) {
-			newPage();	//new pages seperate copies
-    }
-	}
-
-  //clean up
-  p.end(); //send the data to the printer
-  emit printingFinished();
-	clearQueue();//delete all items
-}
-
-/** Appends items to the printing queue. */
-void CPrinter::appendItems( ListCPrintItem& items ){
-	for(items.first(); items.current(); items.next()) {
-		items.current()->setStyle(m_standardStyle);
-		m_queue.append(items.current());
-	}
-	if (items.count() && !m_addedItem) {
-		m_addedItem = true;
-		emit addedFirstQueueItem();	
-	}
-}
-
-/**  */
-void CPrinter::clearQueue(){
-	m_queue.clear();
-	m_addedItem = false;//queue is empty	
-	emit queueCleared();	
-}
-
-/** Returns the print queue object. */
-ListCPrintItem& CPrinter::queue() {
-	return m_queue;
-}
-
-/** Sets the printing queue to queue. */
-void CPrinter::setPrintQueue( ListCPrintItem& queue ){
-	clearQueue();
-	m_queue = queue; //copy items
-}
-
-/** Appends the item o the queue. */
-void CPrinter::appendItem(CPrintItem* newItem){
-	if (!newItem)
-		return;
-	newItem->setStyle(m_standardStyle);
-	m_queue.append(newItem);
-
-	if (!m_addedItem) {
-		m_addedItem = true;
-		emit addedFirstQueueItem();
-	}
-}
-
-/** Reads the style from config. */
-void CPrinter::setupStyles(){	
-//load local styles	
-	QDir d( m_styleSaveLocation );
-	QStringList files = d.entryList("*.xml");
-  CStyle* style = 0;
-	for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-		m_styleList.append( style = new CStyle() ); //automatically load from file		
-    style->loadFromFile(m_styleSaveLocation + *it);
-	}
-	
-//load styles included in this source file!
-  if (CStyle* newStyle = new CStyle(m_styleData.standardStyle)) {
- 		bool found = false;				
- 		for(m_styleList.first(); m_styleList.current() && !found; m_styleList.next()) {
- 			if (newStyle->styleName() == m_styleList.current()->styleName()) {
- 				found = true;
- 			}
- 		}		
-				
- 		if (!found) {
- 			m_styleList.append( newStyle );
- 		}
-     else {
-       delete newStyle;
-     };
-  };
-
-  if (CStyle* newStyle = new CStyle(m_styleData.bwStyle)) {
- 		bool found = false;				
- 		for(m_styleList.first(); m_styleList.current() && !found; m_styleList.next()) {
- 			if (newStyle->styleName() == m_styleList.current()->styleName()) {
- 				found = true;
- 			}
- 		}		
-				
- 		if (!found) {
- 			m_styleList.append( newStyle );
- 		}
-     else {
-       delete newStyle;
-     };
-  };
-
-
-//load systemwide styles, probably standard styles installed by BibleTime
-	KStandardDirs stdDirs;
-	QStringList globalPaths = stdDirs.findDirs("data", "bibletime/"+m_styleDir);
-	if (globalPaths.count()) { //try to find some new global styles	
-		for (QStringList::Iterator path = globalPaths.begin(); path!=globalPaths.end(); ++path) {
-			d = QDir( *path );
-			QStringList files = d.entryList("*.xml");
-			for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-				CStyle* newStyle = new CStyle();
-        newStyle->loadFromFile(*path + *it);
-				
-				bool found = false;				
-				for(m_styleList.first(); m_styleList.current() && !found; m_styleList.next()) {
-					if (newStyle->styleName() == m_styleList.current()->styleName()) {
-						found = true;
-					}
-				}		
-				
-				if (!found) {
-					m_styleList.append( newStyle );
-				}
-        else {
-          delete newStyle;
-        };
-			}		
-		}
-	}
-}
-
-/** Saves the styles to config file. */
-void CPrinter::saveStyles(){
-	QDir d(m_styleSaveLocation);	
-	QStringList files = d.entryList("*.xml");
-	for ( QStringList::Iterator it = files.begin(); it != files.end(); ++it ) {
-		d.remove(*it);
-	}
-	
-	for (m_styleList.first(); m_styleList.current(); m_styleList.next()) {
-		m_styleList.current()->saveToFile(  m_styleSaveLocation + QString::fromLatin1("printing-style-%1").arg(m_styleList.at()) + ".xml" );
-	}
-}
-
-/**  */
-void CPrinter::readSettings(){
-	KConfigGroupSaver gs(m_config, "Settings");
-	const QString leading = "kde-bibletime-";
-		
-	setFullPage(true);
-	m_pagePosition.curPage = 1;
-	m_pagePosition.rect = contentSize();
-
-	QPaintDeviceMetrics m(this);
-	const float r = static_cast<float>(m.width()) / m.widthMM();		
-	m_pageMargin.left 	= (int)(r * m_config->readNumEntry("Left margin", 15));
-	setOption(leading+"left_margin", QString::number(m_config->readNumEntry("Left margin", 15)));
-	
-	m_pageMargin.right 	= (int)(r * m_config->readNumEntry("Right margin", 15));
-	setOption(leading+"right_margin", QString::number(m_config->readNumEntry("Right margin", 15)));
-		
-	m_pageMargin.top 		= (int)(r * m_config->readNumEntry("Top margin", 15));
- 	setOption(leading+"upper_margin", QString::number(m_config->readNumEntry("Top margin", 15)));
-		
-	m_pageMargin.bottom = (int)(r * m_config->readNumEntry("Bottom margin", 15));
-	setOption(leading+"lower_margin", QString::number(m_config->readNumEntry("Bottom margin", 15)));		
-	
-	m_cachedPage.refresh = true;	
-}
-
-/**  */
-void CPrinter::saveSettings(){	
-	const QString leading = "kde-bibletime-";
-	KConfigGroupSaver gs(m_config, "Settings");
-	m_config->writeEntry("Left margin", option(leading+"left_margin").toInt());
-	m_config->writeEntry("Right margin", option(leading+"right_margin").toInt());
-	m_config->writeEntry("Top margin", option(leading+"upper_margin").toInt());
-	m_config->writeEntry("Bottom margin", option(leading+"lower_margin").toInt());
-}
-
-/** Returns the list of styles. */
-StyleItemList& CPrinter::styleList() {
-	return m_styleList;
-}
-
-/** Sets the application wide style list to list. */
-void CPrinter::setStyleList( StyleItemList& list){
-	m_styleList = list; //copy items
-}
-
-/** Returns the page size without headers. */
-const QRect CPrinter::contentSize() {
-  if 	(	m_cachedPage.refresh || !m_cachedPage.initialized || (m_cachedPage.initialized && (m_cachedPage.cachedPaper != pageSize())) )
-  { //refresh page size info
-		m_cachedPage.initialized = true;
-		m_cachedPage.refresh = false;
-		m_cachedPage.cachedPaper = pageSize();		
-		
-	  QPaintDeviceMetrics metric( this ); //note that metric's width and height span the whole page				
-	  m_cachedPage.size.setLeft( m_pageMargin.left );
-	  m_cachedPage.size.setTop( m_pageMargin.top );
-	  m_cachedPage.size.setRight( metric.width() -  m_pageMargin.right );
-	  m_cachedPage.size.setBottom( metric.height() /*- m_pageMargin.top*/ - m_pageMargin.bottom );
-	}
-  return m_cachedPage.size;
-}
-
-/** Returns the config used for this printer object. */
-KConfig* const CPrinter::config() const {
-	return m_config;	
-}
-
-/** Creates the standard style. */
-void CPrinter::setupStandardStyle(){
-	//see if m_items contains standard style
-	bool found = false;
-	for (m_styleList.first(); m_styleList.current(); m_styleList.next()) {
-		if (m_styleList.current()->styleName() == i18n("Standard")) {	//found the style
-			found = true;
-			m_standardStyle = m_styleList.current();
-			break;
-		}
-	}
-		
-	if (!found) {
-		m_standardStyle = new CStyle();		
-		m_standardStyle->setStyleName(i18n("Standard"));		
-		m_styleList.append( m_standardStyle );
-	}
-}
-
-/** Sets the vertical position of the printer's painter. */
-void CPrinter::setVerticalPos( const int yPos ){
-	m_pagePosition.rect.setY(yPos);
-}
-
-/** Emits the signal that the styles changed. */
-CStyle* const CPrinter::standardStyle() const {
-	return m_standardStyle;
-}
diff --git a/bibletime/printing/cprinter.h b/bibletime/printing/cprinter.h
deleted file mode 100644
index 0037699..0000000
--- a/bibletime/printing/cprinter.h
+++ /dev/null
@@ -1,235 +0,0 @@
-/***************************************************************************
-                          cprinter.h  -  description
-                             -------------------
-    begin                : Sat Aug 5 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPRINTER_H
-#define CPRINTER_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-#include "cprintitemlist.h"
-#include "cprintitem.h"
-#include "cstylelist.h"
-#include "cstyle.h"
-
-//KDE includes
-#include <kprinter.h>
-
-//Qt includes
-#include <qobject.h>
-#include <qpainter.h>
-
-
-/**
-	* This is the class which prints the items (low-level).
-	* It uses a QPainter to do it.
-  * @author The BibleTime team
-  */
-
-class CPrinterDialog;
-class CPrintItem;
-class CSwordBackend;
-
-class KConfig;
-class KProcess;
-
-class CPrinter : public QObject, public KPrinter, public CPointers  {
-	Q_OBJECT
-public:	
-	struct CPageSize {
-	  unsigned int width;
-	  unsigned int height;
-	};
-	struct CPagePosition {
-	  unsigned int curPage;
-	  QRect rect;
-	};	
-	struct CPageMargin {
-	  unsigned int top;
-	  unsigned int right;
-	  unsigned int bottom;
-	 	unsigned int left;
-	};
-	
-	CPrinter( QObject* parent );
-	virtual ~CPrinter();
-  /**
-  * Sets the vertical position of the printer's painter.
-  */
-  void setVerticalPos( const int yPos );
-  /**
-  * returns the vertical position of the printer's painter.
-  */
-  const int verticalPos() const;
-	/**
-	* Creates a new page and positions the painter at the beginning of it.
-	*/
-  const bool newPage();
-  /**
- 	* Returns the margins of the pages.
- 	*/
-  const CPrinter::CPageMargin& pageMargins() const;
-  /**
- 	* Sets all the margins at one time.
- 	*/
-  void setAllMargins( const CPageMargin margins );
-  /**
- 	* Setups the printer using CPrinterDialog.
- 	*/
-  void setup( QWidget* parent );
-  /**
- 	* Starts printing the items.
- 	*/
-  void print();
-  /**
- 	* Sets the printing queue to queue.
- 	*/
-  void setPrintQueue(ListCPrintItem& queue);
-  /**
- 	* Returns the print queue object.
- 	*/
-  ListCPrintItem& queue();
-  /**
- 	* Appends items to the printing queue.
- 	*/
-  void appendItems( ListCPrintItem& items );
-  /**
-  * Appends the item o the queue.
-  */
-  void appendItem( CPrintItem* newItem );
-  /**
-  * Sets the application wide style list to list.
-  */
-  void setStyleList( StyleItemList& list);
-  /**
-  * Returns the list of styles.
-  */
-  StyleItemList& styleList();
-  /**
-  * Reimplementation. cReates a new page.
-  */
-  const QRect contentSize();
-  /**
-  * Returns the config used for this printer object.
-  */
-  KConfig* const config() const;
-  /**
-  * Returns the standard stlye of the printer
-  */
-  CStyle* const standardStyle() const;
-
-public slots: // Public slots
-  /**
-  * Clears the printing queue.
-  */
-  void clearQueue();
-  /**
-  * Emits the signal that the styles changed.
-  */
-  void emitStylesChanged();
-
-protected:
-  /**
-  * Saves the styles to config file.
-  */
-  void saveStyles();
-  /**
-  * Reads the style from config.
-  */
-  void setupStyles();
-  /**
-  *
-  */
-  void saveSettings();
-  /**
- 	*
- 	*/
-  void readSettings();
-  /**
- 	* Creates the standard style.
- 	*/
-  void setupStandardStyle();
-
-private:
-	CPageMargin	m_pageMargin;
-	CPagePosition	m_pagePosition;
-	ListCPrintItem m_queue;
-	StyleItemList	m_styleList;
-	CStyle* m_standardStyle;
-	KConfig* m_config;
-
-	struct PaperSizeCache {
-		bool initialized;
-		bool refresh;		
-		KPrinter::PageSize cachedPaper;
-		QRect size;
-	} m_cachedPage;
-	
-	bool m_addedItem;
-
-  struct {
-    QString standardStyle;
-    QString bwStyle;
-  } m_styleData;
-	 	
-	QString m_styleSaveLocation;
-	QString m_styleDir;
-	
-signals: // Signals
-	/**
-	* Is emitted if percent percent of the printing process are completed.
-	*/
-	void percentCompleted(const int percent);
-  /**
- 	* Is emitted after all items were printed.
- 	*/
-  void printingFinished();
-  /**
- 	* Is emitted when printing was interrupted by the user.
- 	*/
-  void printingInterrupted();
-  /**
- 	* Is emmitted when the printing has started.
- 	*/
-  void printingStarted();	
-  /**
- 	* Is emmitted when the first item was added to the queue
-	* This signal is useful to enable the "Clear printer queue"
- 	* icon if the queue contains items
- 	*/
-  void addedFirstQueueItem();	
-  /**
- 	* Is emmitted when the printing queue was cleared.
- 	*/
-  void queueCleared();
-  /**
-  * The styles changed.
-  */
-  void sigStylesChanged();
-};
-
-/** returns the vertical position of the printer's painter. */
-inline const int CPrinter::verticalPos() const {
-	return m_pagePosition.rect.y();
-}
-
-/** Emits the signal that the styles changed. */
-inline void CPrinter::emitStylesChanged(){
-	emit sigStylesChanged();
-}
-
-#endif
-
diff --git a/bibletime/printing/cprintitem.cpp b/bibletime/printing/cprintitem.cpp
deleted file mode 100644
index 6091090..0000000
--- a/bibletime/printing/cprintitem.cpp
+++ /dev/null
@@ -1,429 +0,0 @@
-/***************************************************************************
-                          cprintitem.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-
-#include "cprintitem.h"
-#include "cprintitemlist.h"
-#include "cstyle.h"
-#include "backend/cswordmoduleinfo.h"
-#include "backend/cswordversekey.h"
-#include "backend/cswordldkey.h"
-#include "backend/cswordtreekey.h"
-//#include "backend/chtmlentrydisplay.h"
-#include "frontend/cbtconfig.h"
-#include "util/scoped_resource.h"
-
-
-//Qt includes
-#include <qsimplerichtext.h>
-#include <qlistview.h>
-#include <qregexp.h>
-#include <qstylesheet.h>
-
-//Sword includes
-#include <swmodule.h>
-#include <swkey.h>
-#include <versekey.h>
-
-
-#define PARAGRAPH_SPACE 10 // Space between different paragraphs
-#define STYLE_PART_SPACE 1	//Space between the different parts (header, moduletext ...)
-#define BORDER_SPACE 3 	//border between text and rectangle
-
-
-CPrintItem::ListViewItem::ListViewItem( QListView* parent, CPrintItem* printItem )
-	: QListViewItem(parent), m_printItem(printItem) {
-	
-};
-
-CPrintItem* const CPrintItem::ListViewItem::printItem() const {
-	return m_printItem;
-};
-
-CStyle* const CPrintItem::ListViewItem::style() const {
-	return (m_printItem) ? m_printItem->style() : 0;
-};
-
-
-CPrintItem::CPrintItem(CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, const QString& description,const CSwordBackend::DisplayOptions displayOptions, const CSwordBackend::FilterOptions filterOptions)
-  : m_style(0),
-  m_headerText(QString::null),
-  m_description(description),
-  m_moduleText(QString::null),
-  m_startKey(startKey),
-  m_module(module),
-  m_listViewItem(0),
-  m_displayOptions(displayOptions),
-  m_filterOptions(filterOptions)
-{	
-	m_startEmpty = startKey.isEmpty();	
-	m_stopKey = (!m_startEmpty && (startKey != stopKey) ) ? stopKey : QString::null;
-	m_stopEmpty  = m_stopKey.isEmpty();	
-	
-	headerText();
-	moduleText(); //cache the module text, makes printing faster (at least the user thinks this :)
-}
-
-/** Returns the moduletext used by this item. */
-const QString& CPrintItem::moduleText() {
-	/**
-	* If a special text is set use the text.
-	* If the moduleText variable is empty use the CModuleInfo
-	* object to retrieve the text,
-	*/
-	if (!m_moduleText.isEmpty()) //cached text
-		return m_moduleText;
-
-	if (m_startEmpty || !m_module)
-		return QString::null;
-
-	CPointers::backend()->setDisplayOptions(m_displayOptions);
-	CPointers::backend()->setFilterOptions(m_filterOptions);	
-	
-	if (m_stopEmpty) {//only start key
-		util::scoped_ptr<CSwordKey> key(CSwordKey::createInstance(m_module));
-		key->key(m_startKey);
-		m_moduleText = key->renderedText();			
-	}
-	else if (m_module->type() == CSwordModuleInfo::Bible || m_module->type() == CSwordModuleInfo::Commentary ) {
-		util::scoped_ptr<CSwordVerseKey> startKey(dynamic_cast<CSwordVerseKey*>(CSwordKey::createInstance(m_module)));
-		util::scoped_ptr<CSwordVerseKey> stopKey(dynamic_cast<CSwordVerseKey*>(CSwordKey::createInstance(m_module)));
-		
-		startKey->key(m_startKey);
-		stopKey->key(m_stopKey);
-	
-//		const QString format = QString::fromLatin1(" <FONT SIZE=\"-2\"><NOBR>%1</NOBR></FONT>");
-		const QString format = QString::fromLatin1(" <FONT SIZE=\"-3\"><NOBR>%1</NOBR></FONT> ");
-		while ( (*startKey) < (*stopKey) || (*startKey) == (*stopKey) ) {
-			m_moduleText += (m_displayOptions.verseNumbers ? format.arg(startKey->Verse()) : QString::null)
-+ startKey->renderedText() + (/*m_displayOptions.lineBreaks ?*/ "<BR>\n"/* : QString::null*/);
-			startKey->next(CSwordVerseKey::UseVerse);
-		}
-	}
-//	else if (m_module->type() == CSwordModuleInfo::GenericBook ) {
-//		util::scoped_ptr<CSwordTreeKey> startKey(dynamic_cast<CSwordTreeKey*>(CSwordKey::createInstance(m_module)));
-//		util::scoped_ptr<CSwordTreeKey> stopKey(dynamic_cast<CSwordTreeKey*>(CSwordKey::createInstance(m_module)));
-//
-//		startKey->key(m_startKey);
-//		stopKey->key(m_stopKey);
-//
-//    while ( (startKey < stopKey) || (startKey == stopKey) ) {
-//      m_moduleText = startKey->renderedText();
-//      (*startKey)++;
-//      qWarning(startKey->key().latin1());
-//    }
-//  };
-	
-	m_moduleText.replace(QRegExp("$\n\n+"), "");
-	m_moduleText.replace(QRegExp("$<BR><BR>+"), "");	
-	return m_moduleText;
-}
-
-/** Sets the style for this item. */
-void CPrintItem::setStyle( CStyle* newStyle ) {
-	m_style = newStyle;
-}
-
-CStyle* const CPrintItem::style() const {
-	return m_style;
-}
-
-/** Returns the listview item for this printitem. */
-QListViewItem* CPrintItem::listViewItem( CPrintItemList* list ) {
-	deleteListViewItem();
-	m_listViewItem = new ListViewItem( list, this );
-	updateListViewItem();
-	return m_listViewItem;
-}
-
-/** Updates the item. */
-void CPrintItem::updateListViewItem(){
-	if (m_module)
-		m_listViewItem->setText(0, m_module->name() );
-	
-	if (!m_startEmpty)
-		m_listViewItem->setText(1,m_startKey);
-	
-	if (!m_stopEmpty)
-		m_listViewItem->setText(2,m_stopKey);
-	else if (!m_startEmpty)
-		m_listViewItem->setText(2,m_startKey);
-	
-	if (m_style)
-		m_listViewItem->setText(3, m_style->styleName() );
-}
-
-/**  */
-
-QListViewItem* const CPrintItem::listViewItem() const {
-	return m_listViewItem;
-}
-
-/** Deletes the list view item. */
-void CPrintItem::deleteListViewItem(){
-	delete m_listViewItem;
-	m_listViewItem = 0;
-}
-
-/** Draws the content of this item on the page. */
-void CPrintItem::draw(QPainter* p, CPrinter* printer){
-	/**
-	* Print this item
-	* Steps to do for the printing:
-	*
-	*	1. Get the settings (font, colors, alignment etc.) and generate the correct richtext for this (correct alignment)
-	*	2. Apply the settings to the printer's painter object
-	*/
-	QFont font;
-	QColor fgColor;
-	QColor bgColor;
-	CStyle::Format* format;
-	CStyle::Format::Frame* frame = 0;
-	int frameThickness = 0;
-	CStyle::Format::Alignment alignment;	
-	CStyle::StyleType type = CStyle::Unknown;
-	QString text;
-	
-	QColorGroup cg;
-	QPen pen;
-	QBrush brush;
-
-	const int leftMargin 	= printer->pageMargins().left;
-	const int upperMargin = printer->pageMargins().top;	
-	const QRect pageSize =  printer->contentSize();
-	const int pageHeight 	= pageSize.height();
-	const int pageWidth 	= pageSize.width();
-	
-//moved out of the loop for optimization	
-	int verticalPos = printer->verticalPos();		
-	int arguments	= 0;
-	QRect boundingRect; //rectangle for the content
-	QRect br;	
-	QRect view;
-	QPen framePen;
-	int movePixs;
-	
-	for (int i = 0; i < 3; ++i) {		
-		type = static_cast<CStyle::StyleType>(i);
-		
-		if (!m_style->hasFormatTypeEnabled(type)) //jump to next part if this is not enabled
-			continue;
-				
-		format 	= m_style->formatForType( type );
-		fgColor = format->color( CStyle::Format::Foreground );
-		bgColor = format->color( CStyle::Format::Background );
-		pen.setColor(fgColor);
-		font = format->font();
-		
-		frame = format->frame();
-		frameThickness = frame ? frame->thickness() : 0;		
-		alignment = format->alignment();
-		if (type == CStyle::Header)
-			text = headerText();
-		else if (type == CStyle::Description)
-			text = m_description;
-		else
-			text = moduleText();
-
-		p->setFont(font);
-		p->setPen(pen);
-		cg.setColor(QColorGroup::Text, fgColor);
-				
-		arguments = Qt::WordBreak;		
-		if (alignment == CStyle::Format::Left)
-			arguments |= Qt::AlignLeft;
-		else if (alignment == CStyle::Format::Center)
-			arguments |= Qt::AlignHCenter;
-		else if (alignment == CStyle::Format::Right)
-			arguments |= Qt::AlignRight;
-				
-		if ((type == CStyle::Header || type == CStyle::Description) && !text.isEmpty()) {
-			boundingRect = p->boundingRect (
-				leftMargin, //x of upper left corner
-				verticalPos, //y of upper left corner
-				pageWidth - 2*BORDER_SPACE - 2*frameThickness, //pixels to the right from the upper left corner
-				pageHeight - 2*BORDER_SPACE - 2*frameThickness - verticalPos + upperMargin, //pixels down from upper left corner
-				arguments, text
-			);
-			
-			//check if the new text fits into the current page page
-			//WARNING: use 2* or 1* frameThickness here??
-			if ( 		( boundingRect.height() + 2*BORDER_SPACE + 2*frameThickness + STYLE_PART_SPACE )
-						> ( pageHeight - verticalPos  + upperMargin ) )
-			{
-				//this part doesn't fit on the current page
-				printer->newPage();
-				verticalPos = printer->verticalPos();
-				boundingRect = p->boundingRect(
-					leftMargin,
-					verticalPos,
-					pageWidth - 2*BORDER_SPACE - 2*frameThickness,
-					pageHeight- 2*BORDER_SPACE - 2*frameThickness - verticalPos + upperMargin,
-					arguments, text
-				);
-			}
-			br = boundingRect;	//rectangle for the background fill		
-			br.setLeft(leftMargin);
-			br.setWidth(pageWidth-frameThickness); //because we move in the next lines
-			br.setHeight(br.height()+BORDER_SPACE); //because we move in the next lines
-			br.moveBy(frameThickness, frameThickness);			
-			p->fillRect(br, bgColor);
-
-			br = boundingRect;	// the rect for the border		
-			/**
-			* we have to substract frameThickness/2,
-			* because QPainter paints one half outside and the other part inside the rectangle.
-			*/
-			const int halfWidth = (int)((float)frameThickness/2);
-
-//			br.setHeight( br.height() + 2*halfWidth  + BORDER_SPACE );						
-			br.setLeft( leftMargin + halfWidth );
-			br.setTop( br.top() + halfWidth ); //boundingRect is moved by 2*halfWidth down -> use +halfWidth !!
-			br.setWidth( pageWidth - 2*halfWidth);
-			br.setHeight( br.height() + 2*halfWidth  + BORDER_SPACE );						
-			
-//			boundingRect.setWidth(boundingRect.width()+5);//HACK to avoid cut letters
-			boundingRect.moveBy(BORDER_SPACE + frameThickness, frameThickness);
-//			arguments |= Qt::AlignVCenter; //WARNING: Right here? Will it change the boundingrect??
-
-    		p->setClipRect(
-    			upperMargin,
-    			leftMargin,
-    			pageWidth,
-    			pageHeight
-    		);
-
-			p->drawText(boundingRect, arguments, text);
-			
-			p->setClipping(false);
-			
-			printer->setVerticalPos(boundingRect.top() + boundingRect.height() + 2*frameThickness + STYLE_PART_SPACE);
- 			verticalPos = printer->verticalPos();
- 			
-			if (frame) {
-				framePen = pen;
-				framePen.setWidth( frameThickness );
-				framePen.setColor( frame->color() );
-				framePen.setStyle( frame->lineStyle() );
-				p->setPen( framePen );
-
-				p->drawRect( br );
-			}						
-		}
-		else if (type == CStyle::ModuleText) {		
-			p->save();
-			
-			font = CBTConfig::get( m_module->language() ).second;
-
-			if (alignment == CStyle::Format::Center)		
-				text = QString::fromLatin1("<CENTER>%1</CENTER>").arg(text);
-			else if (alignment == CStyle::Format::Right)		
-				text = QString::fromLatin1("<P ALIGN=\"RIGHT\">%1</P>").arg(text);
-    	QSimpleRichText richText(
-    		text,
-    		font,
-    		QString::null,
-    		QStyleSheet::defaultSheet(),
-    		QMimeSourceFactory::defaultFactory(),
-				pageHeight + upperMargin - verticalPos - 2*frameThickness - 2*BORDER_SPACE
-			);
-
-    	richText.setWidth( p, pageWidth-2*frameThickness-2*BORDER_SPACE );
-    	view = QRect( //the content area of the whole page
-    		leftMargin + frameThickness  + BORDER_SPACE,
-    		upperMargin + frameThickness + BORDER_SPACE,
-	    	pageWidth - 2*frameThickness - 2*BORDER_SPACE,
-	    	pageHeight - 2*frameThickness - 2*BORDER_SPACE
-    	);
-    	
-    	int translated = 0;
-    	do {
-    		if ((int)(verticalPos - upperMargin + richText.height() - translated) <= (int)(pageHeight) ) {
-    			//text fits on current page
-					br = QRect (
-	    			leftMargin + frameThickness,
-	    			verticalPos + frameThickness,
-		    		pageWidth - frameThickness,
-		    		richText.height() - translated + frameThickness + BORDER_SPACE
-	    		);
-				}
-    		else { //doesn't fit completely on current page, fill to bottom of the page    		
-		    	br = QRect(
-		    		leftMargin + frameThickness,
-		    		verticalPos + frameThickness,
-			    	pageWidth - frameThickness,
-			    	pageHeight - verticalPos + upperMargin - frameThickness
-		    	);
-    		}
-				br.moveBy(0,translated); //we have to move down as far as the painter moved    		
-    		p->setClipRect(
-    			upperMargin,
-    			leftMargin,
-    			pageWidth,
-    			pageHeight
-    		);
-   			p->fillRect(br,QBrush(bgColor)); //fill rect with background color
-				if (frame) {
-					br.moveBy( (int)(-(float)frameThickness/2), (int)(-(float)frameThickness/2) );	
-
-					framePen = pen;
-					framePen.setWidth( frameThickness );
-					framePen.setColor( frame->color() );
-					framePen.setStyle( frame->lineStyle() );
-					p->setPen( framePen );
-
-					p->drawRect(br);
-				}						   			
-    		p->setClipping(false);
-    		
-        richText.draw(p, leftMargin+frameThickness+BORDER_SPACE, verticalPos+frameThickness+BORDER_SPACE, view, cg);
-				movePixs = //move down the painted area height
-						(((int)richText.height()-translated) > (int)(pageHeight - verticalPos + upperMargin ))
-					? (pageHeight - verticalPos + upperMargin) //move to bottom of page
-					: richText.height() - translated + 2*frameThickness + 2*BORDER_SPACE; //only move the painted area
-
-   			printer->setVerticalPos(verticalPos + movePixs);					
-
-		    view.moveBy( 0,movePixs);
-        p->translate( 0,-movePixs);
-        translated += movePixs;
-        if ( view.top() >= richText.height() ) //bottom or top(default)
-    			break;
-
-    		printer->newPage();
-   			verticalPos = printer->verticalPos();    		
-    	} while (true);
-			p->restore();
-    }
-	}
-	printer->setVerticalPos(printer->verticalPos() + PARAGRAPH_SPACE);	
-}
-
-/** Updates and returns the header text. */
-const QString& CPrintItem::headerText() {
-	if (!m_headerText.isEmpty())  // cached?
-		return m_headerText;
-
-  if (m_startEmpty)
-  	return QString::null; 	
-	if (m_stopEmpty)
-		m_headerText = m_startKey;
-	else {//start and stop key do exist and are different
-		m_headerText = QString::fromLatin1("%1 - %2").arg(m_startKey).arg(m_stopKey);
-	}	
-	return m_headerText;
-}
diff --git a/bibletime/printing/cprintitem.h b/bibletime/printing/cprintitem.h
deleted file mode 100644
index 81b33a3..0000000
--- a/bibletime/printing/cprintitem.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/***************************************************************************
-                          cprintitem.h  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPRINTITEM_H
-#define CPRINTITEM_H
-
-//BibleTime includes
-#include "frontend/cbtconfig.h"
-
-//Qt includes
-#include <qobject.h>
-#include <qguardedptr.h>
-#include <qptrlist.h>
-#include <qlistview.h>
-
-class CSwordKey;
-class CSwordModuleInfo;
-class CStyle;
-class CPrinter;
-class CPrintItem;
-class CPrintItemList;
-
-typedef QPtrList<CPrintItem> ListCPrintItem;
-
-/**
-	* The class which implements the printable items.
-  * @author The BibleTime team
-  */
-class CPrintItem {
-public:
-  class ListViewItem : public QListViewItem {
-		public:
-			ListViewItem( QListView* parent, CPrintItem* printItem );
-			CPrintItem* const printItem() const;		
-			CStyle* const style() const;			
-		private:
-			CPrintItem* m_printItem;
-  };
-	
-	CPrintItem(CSwordModuleInfo* module, const QString& startKey, const QString& stopKey, const QString& description = QString::null, const CSwordBackend::DisplayOptions displayOptions = CBTConfig::getDisplayOptionDefaults(),const CSwordBackend::FilterOptions filterOptions = CBTConfig::getFilterOptionDefaults() );
-  /**
-	* Sets the style for this item.
- 	*/
-	void setStyle( CStyle* );
-  /**
-	* Sets the style for this item.
- 	*/
-	CStyle* const style() const;
-  /**
- 	* Returns the listview item for this printitem.
- 	*/
-  QListViewItem* listViewItem( CPrintItemList* );
-  /**
- 	* Updates the item.
- 	*/
-  void updateListViewItem();
-  /**
-	* Returns the used ListView item.
-	*/
-  QListViewItem* const listViewItem() const;
-  /**
- 	* Deletes the list view item.
- 	*/
-  void deleteListViewItem();
-  /**
-  * Draws the content of this item on the page.
-  */
-  void draw(QPainter* p, CPrinter* printer);
-
-private: // Protected attributes
-  const QString& headerText();
-  const QString& moduleText();
-
-  CStyle* m_style;
-  QString m_headerText;
-  QString m_description;
-  QString m_moduleText;
-	QString m_startKey;
-	QString m_stopKey;
-	bool m_startEmpty;
-	bool m_stopEmpty;
-  CSwordModuleInfo* m_module;
-  QListViewItem* m_listViewItem;
-
-  CSwordBackend::DisplayOptions m_displayOptions;
-  CSwordBackend::FilterOptions m_filterOptions;
-};
-
-#endif
diff --git a/bibletime/printing/cprintitemlist.cpp b/bibletime/printing/cprintitemlist.cpp
deleted file mode 100644
index 3bd6ad6..0000000
--- a/bibletime/printing/cprintitemlist.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/***************************************************************************
-                          cprintitemlist.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//Own includes
-#include "cprintitemlist.h"
-
-//Qt includes
-#include <qstring.h>
-
-//KDE includes
-#include <klocale.h>
-
-CPrintItemList::CPrintItemList( ListCPrintItem* items,  QWidget *parent, const char *name ) : KListView(parent,name) {
-	m_items = items;
-	initView();
-	
-	insertItems(m_items);
-}
-
-CPrintItemList::~CPrintItemList(){
-	for (m_items->first(); m_items->current(); m_items->next()) {
-		if (m_items->current())
-			m_items->current()->deleteListViewItem();
-	}	
-}
-
-/** Initializes the view. */
-void CPrintItemList::initView(){
-	setAllColumnsShowFocus(true);
-	addColumn(i18n("Module"),-1);
-	addColumn(i18n("From"), -1);
-	addColumn(i18n("To"), -1);	
-	addColumn(i18n("Style"), -1);	
-
-  //disable sorting for all columns
-  setSorting(-1);    
-  	
-	setSelectionMode( QListView::Extended );
-}
-
-/** Inserts the items of the list into the tree. */
-void CPrintItemList::insertItems( ListCPrintItem* itemList ) {
-	const bool sameList = (itemList == m_items);
-	for(itemList->last(); itemList->current(); itemList->prev() ) {
-		if (!sameList)
-			m_items->append(itemList->current());
-		itemList->current()->listViewItem(this);	//insert the QListViewItem into the list
-	}
-}
-
-/** Sets the tree to contain the items of the list. Other items will be removed. */
-void CPrintItemList::setItems( ListCPrintItem* itemList ){
-	for (m_items->first(); m_items->current(); m_items->next()) {
-		if (m_items->current())
-			m_items->current()->deleteListViewItem();
-	}
-	insertItems( itemList );
-}
-
-/** Deletes the current item. */
-void CPrintItemList::deleteSelectedItems(){
-	QPtrList<QListViewItem> items = selectedItems();	
-	if (!items.count())
-		return;
-	const bool autoDelete = items.autoDelete();
-	
-	CPrintItem* p = 0;
-	for (items.first(); items.current(); items.next()) {
-		if ( CPrintItem::ListViewItem* item = dynamic_cast<CPrintItem::ListViewItem*>(items.current()) ) {
-			if (!(p = item->printItem()))
-				continue;
-      const int pos = m_items->findRef(p);
-			if (pos != -1) //make sure item's pointer was found
-        m_items->take(pos);
-			p->deleteListViewItem();
-			if (!autoDelete)
-				delete p;
-		}
-	}
-}
-
-/** Moves the item one item up. */
-void CPrintItemList::moveUp(){
-	QPtrList<QListViewItem> items = selectedItems();
-	for (items.first(); items.current(); items.next()) {
-		QListViewItem* current = items.current();
-		if (current && current->itemAbove() &&  current->itemAbove()->itemAbove()) {
-			current->moveItem( current->itemAbove()->itemAbove() );
-		}
-	}
-}
-
-/** Moves the selected entry one entry down. */
-void CPrintItemList::moveDown(){
-	QPtrList<QListViewItem> items = selectedItems();
-	for (items.last(); items.current(); items.prev()) {
-		QListViewItem* current = items.current();
-		if (current && current->itemBelow()) {
-			current->moveItem( current->itemBelow() );
-		}
-	}
-}
-
-/** Applies the style to the selected items. */
-void CPrintItemList::applyStyleToSelected( CStyle* style){
-	CPrintItem* printItem;
-	CPrintItem::ListViewItem* item;
-	QPtrList<QListViewItem> list = selectedItems();
-	for ( QListViewItem* i = list.first(); i; i = list.next()) {
-		if ((item = dynamic_cast<CPrintItem::ListViewItem*>(i))) {
-			printItem = item->printItem();
-			printItem->setStyle(style);
-			printItem->updateListViewItem();
-		}
-	}
-}
-
diff --git a/bibletime/printing/cprintitemlist.h b/bibletime/printing/cprintitemlist.h
deleted file mode 100644
index fc1cf8f..0000000
--- a/bibletime/printing/cprintitemlist.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/***************************************************************************
-                          cListCPrintItem.h  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPRINTITEMLIST_H
-#define CPRINTITEMLIST_H
-
-#include <qwidget.h>
-#include <qptrlist.h>
-#include <klistview.h>
-
-#include "cprintitem.h"
-
-/**A KListView derived class which handles CPrintItem classes
-  *@author The BibleTime team
-  */
-class CPrintItemList : public KListView  {
-   Q_OBJECT
-public:
-	CPrintItemList(ListCPrintItem* items, QWidget *parent=0, const char *name=0);
-	~CPrintItemList();
-  /**
- 	* Sets the tree to contain the items of the list. Other items will be removed.
- 	*/
-  virtual void setItems( ListCPrintItem* itemList);
-  /**
- 	* Inserts the items of the list into the tree.
- 	*/
-  virtual void insertItems( ListCPrintItem* itemList );
-  /**
- 	* Initializes the view.
- 	*/
-  virtual void initView();
-  /**
- 	* Applies the style to the selected items.
- 	*/
-  void applyStyleToSelected( CStyle* );
-
-public slots: // Public slots
-  /**
- 	* Moves the selected entry one entry down.
- 	*/
-  void moveDown();
-  /**
- 	* Moves the item one item up.
- 	*/
-  void moveUp();
-  /**
- 	* Deletes the current item.
- 	*/
-  void deleteSelectedItems();
-
-private:
-	ListCPrintItem* m_items;		
-};
-#endif
diff --git a/bibletime/printing/cstyle.cpp b/bibletime/printing/cstyle.cpp
deleted file mode 100644
index b460fc8..0000000
--- a/bibletime/printing/cstyle.cpp
+++ /dev/null
@@ -1,487 +0,0 @@
-/***************************************************************************
-                          cstyle.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cstyle.h"
-#include "cstylelist.h"
-
-
-//Qt includes
-#include <qapplication.h>
-#include <qdom.h>
-#include <qfile.h>
-#include <qlistview.h>
-#include <qstring.h>
-#include <qtextstream.h>
-
-//KDE includes
-#include <klocale.h>
-
-#define CURRENT_SYNTAX_VERSION 1
-
-CStyle::Format::Format(const CStyle::StyleType type) : m_frame(0), m_type(type) {
-	clearData();
-}
-
-CStyle::Format::Format(const Format& f) {
-	m_BGColor = f.m_BGColor;
-	m_FGColor = f.m_FGColor;
-	m_alignment = f.m_alignment;
-	m_font = f.m_font;
-	m_hasFrame = f.m_hasFrame;			
-	m_frame = 0;
-	if (m_hasFrame) {
-		Frame* newFrame = frame();//create
-		*newFrame = *f.m_frame; //copy content
-	}
-	m_type = f.m_type;
-};
-
-CStyle::Format::~Format(){
-	delete m_frame;
-}
-
-/** Returns the font of this style. */
-const QFont& CStyle::Format::font() const {
-	return m_font;
-}
-
-/** sets the font of this format. */
-void CStyle::Format::setFont( QFont newFont ) {
-	m_font = newFont;
-}
-
-/** Returns the background color of this format. */
-const QColor& CStyle::Format::color( const Color type ) const {
-	switch (type) {
-		case Foreground:
-			return m_FGColor;
-		case Background:
-			return m_BGColor;		
-	};
-	return Qt::white; //shouldn't be executed
-}
-
-/** Sets the foreground color of this format. */
-void CStyle::Format::setColor( const Color type, const QColor& newColor ) {
-	switch (type) {
-		case Foreground:
-			m_FGColor = newColor;
-			break;
-		case Background:
-			m_BGColor = newColor;
-			break;
-	};
-}
-
-/** Returns the frame if we have one. Otherwise we return 0. */
-CStyle::Format::Frame* const CStyle::Format::frame() {
-	if (m_hasFrame)
-		return !m_frame ? (m_frame = new CStyle::Format::Frame) : m_frame;
-	return 0;
-}
-
-/** Sets the frame of this style. */
-void CStyle::Format::setFrameEnabled( const bool hasFrame ) {
-	m_hasFrame = hasFrame;
-	if (!m_hasFrame) {
-		delete m_frame;
-		m_frame = 0;
-	};
-}
-
-/** Returns the alignement of this style format. */
-const CStyle::Format::Alignment& CStyle::Format::alignment() const {
-	return m_alignment;
-}
-
-/** Sets the alignement flags of this style format. */
-void CStyle::Format::setAlignment( const Alignment newAlignment) {
-	m_alignment = newAlignment;
-}
-
-/** Resets the data variables. */
-void CStyle::Format::clearData(){
-	m_BGColor = Qt::white;
-	m_FGColor = Qt::black;	
-	delete m_frame;
-	m_frame = 0;	
-	m_hasFrame = false;
-	m_font = QApplication::font();
-	m_alignment = Format::Left;
-}
-
-const CStyle::StyleType CStyle::Format::type() const {
-	return m_type;
-}
-
-CStyle::Format::Frame::Frame() {
-	m_thickness = 1;
-	m_color = Qt::black;
-	m_lineStyle = Qt::SolidLine;
-}
-
-CStyle::Format::Frame::Frame(const Frame& f) {
-	m_thickness = f.m_thickness;
-	m_color = f.m_color;
-	m_lineStyle = f.m_lineStyle;
-}
-
-/** Returns the thickness of this frame. */
-const int& CStyle::Format::Frame::thickness() const {
-	return m_thickness;
-}
-
-/** Sets te thickness of this frame. */
-void CStyle::Format::Frame::setThickness( const int newThickness ) {
-	m_thickness = newThickness;
-}
-
-/** Returns the style how to paint the lines of this frame. */
-const Qt::PenStyle& CStyle::Format::Frame::lineStyle() const {
-	return m_lineStyle;
-}
-
-/** Sets the style how to paint the lines. */
-void CStyle::Format::Frame::setLineStyle( const Qt::PenStyle newLineStyle ){
-	m_lineStyle = newLineStyle;
-}
-
-/** Returns the color of this frame. */
-const QColor& CStyle::Format::Frame::color() const {
-	return m_color;
-}
-
-/** Sets the color of this frame. */
-void CStyle::Format::Frame::setColor( const QColor& newColor ) {
-	m_color = newColor;
-}
-
-CStyle::CStyle() :
-	m_headerFormat(new Format(CStyle::Header)),
-	m_descriptionFormat(new Format(CStyle::Description)),
-	m_moduleTextFormat(new Format(CStyle::ModuleText))
-{
-
-	//dummy command to translate names of standard styles
-//	i18n("Standard");
-//	i18n("Colored style for larger text portions");
-//18n("Black&White for larger text portions");
-	
-	m_listViewItem = 0;
-	m_isHeaderFormatEnabled = m_isDescriptionFormatEnabled = m_isModuleTextFormatEnabled = true;
-
-	setStyleName( i18n("Unknown") );
-};
-
-CStyle::CStyle( const QString text ) :
-	m_headerFormat(new Format(CStyle::Header)),
-	m_descriptionFormat(new Format(CStyle::Description)),
-	m_moduleTextFormat(new Format(CStyle::ModuleText))
-{
-	m_listViewItem = 0;
-	m_isHeaderFormatEnabled = m_isDescriptionFormatEnabled = m_isModuleTextFormatEnabled = true;
-	
-	loadFromText(text);	
-}
-
-CStyle::~CStyle(){
-  delete m_headerFormat;
-  delete m_descriptionFormat;
-  delete m_moduleTextFormat;
-}
-
-/** Returns the proper CStyleFormat for the given type. */
-CStyle::Format* const CStyle::formatForType( const CStyle::StyleType type) {
-	switch (type) {
-		case Header:
-			return m_headerFormat;
-		case Description:
-			return m_descriptionFormat;		
-		case ModuleText:
-			return m_moduleTextFormat;		
-		default:
-			return 0;
-	}
-}
-
-/** Set the printing of the header (true enables it). */
-void CStyle::setFormatTypeEnabled( const CStyle::StyleType type, const bool setEnabled) {
-	switch (type) {
-		case Header:
-			m_isHeaderFormatEnabled = setEnabled;
-			break;
-		
-		case Description:
-			m_isDescriptionFormatEnabled = setEnabled;		
-			break;
-		
-		case ModuleText:
-			m_isModuleTextFormatEnabled = setEnabled;		
-			break;
-		
-		default:
-			break;
-	}
-}
-
-/** Returns a QListViewItem for inserted in list. */
-QListViewItem* const CStyle::listViewItem( CStyleList* const list ){
-	if (!list) {
-		if (!m_listViewItem)
-			return 0;
-		else
-			return m_listViewItem;
-	}
-	deleteListViewItem();
-	m_listViewItem = new QListViewItem( list );
-	updateListViewItem();	
-	return m_listViewItem;
-}
-
-/** Returns the style name */
-const QString& CStyle::styleName() const{
-	return m_name;
-}
-
-/** Sets the name of the style. */
-void CStyle::setStyleName( const QString name ){
-	m_name = name;
-}
-
-/** Clears all variables and sets them back */
-void CStyle::clearData(){
-//	qDebug("CStyle::clearData()");
-	deleteListViewItem();
-	m_name = QString::null;
-	m_isDescriptionFormatEnabled = m_isHeaderFormatEnabled = m_isModuleTextFormatEnabled = true;		
-}
-
-/** Updates the Listview items */
-void CStyle::updateListViewItem(){
-//	qWarning("CStyle::updateListViewItem() for %s", m_name.latin1());
-	m_listViewItem->setText(0, styleName() );
-}
-
-/** Deletes the list view item. */
-void CStyle::deleteListViewItem(){
-	delete m_listViewItem;
-	m_listViewItem = 0;
-}
-
-/** Loads the session from a XML file. */
-const bool CStyle::loadFromFile(const QString& filename){
-	QFile file(filename);
-	if (!file.exists()) {
-		qWarning("file doesn't exist");
-		return false;
-	}
-	
-	if (file.open(IO_ReadOnly)) {	
-		QTextStream t(&file);
-		t.setEncoding(QTextStream::UnicodeUTF8);		
-		loadFromText( t.read() );
-		file.close();	
-	}
-	else {
-		qWarning("CStyle::load: unable to open file %s", filename.latin1());
-		return false;
-	};
-  return true;
-}
-
-const bool CStyle::loadFromText(const QString& text){
-/**
-* The XML file should look like this:
-* 	
- <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE DOC >
- <BibleTimePrintingStyle syntaxVersion="1" name="Standard" translate="1">
-  <HEADER enabled="1" alignment="center">
-    <COLORS bgcolor="black" fgcolor="white">
-    <FONT family="Arial" charset="2" pointsize="10" weight="1" italic="0">
-    <FRAME enabled="1" color="blue" style="1" thickness="2">
-  </HEADER>
- </BibleTimePrintingStyle>
-*/
-	QDomDocument doc;		
-  doc.setContent(text);
-	
-  QDomElement document = doc.documentElement();
-  if(document.tagName() != "BibleTimePrintingStyle") {
-		qWarning("CProfile::load: Missing BibleTime doc");
-		return false;
-	}
-	if (document.hasAttribute("name")) { //name of the printing style
-		m_name = document.attribute("name");
-		if (document.hasAttribute("translate") && document.attribute("translate").toInt()) {
-			m_name = i18n(m_name.local8Bit()); //standard styles should be translated
-		}
-	}
-	
-	QDomElement elem = document.firstChild().toElement();
-	while (!elem.isNull()) {
-		StyleType type = Unknown;
-		if (elem.tagName() == "HEADER") {
-			type = Header;
-		}
-		else if (elem.tagName() == "DESCRIPTION") {
-			type = Description;
-		}
-		else if (elem.tagName() == "MODULETEXT") {
-			type = ModuleText;
-		}
-		Format* p = formatForType(type);
-
-		if (!p || type == Unknown)
-			continue;
-		
-		if (elem.hasAttribute("enabled")) {
-			setFormatTypeEnabled(type, elem.attribute("enabled").toInt());
-		}
-		if (elem.hasAttribute("alignment")) {		
-			const int align = elem.attribute("alignment").toInt();
-			p->setAlignment( static_cast<Format::Alignment>(align) );
-		}
-		
-		QDomElement object = elem.namedItem("COLORS").toElement();
-		if (!object.isNull()) {
-			if (object.hasAttribute("bgcolor"))
-				p->setColor(Format::Background, QColor(object.attribute("bgcolor")));
-			if (object.hasAttribute("fgcolor"))
-				p->setColor(Format::Foreground, QColor(object.attribute("fgcolor")));				
-		}
-
-		object = elem.namedItem("FONT").toElement();
-		if (!object.isNull()) {
-			QString family = object.hasAttribute("family") ? object.attribute("family") : QApplication::font().family();
-			unsigned int size = object.hasAttribute("pointsize") ? object.attribute("pointsize").toInt() : QApplication::font().pointSize();
-			const int weight = object.hasAttribute("weight") ? object.attribute("weight").toInt() : QFont::Normal;
-			const bool italic = object.hasAttribute("italic") ? static_cast<bool>(object.attribute("italic").toInt()) : false;
-			
-			if (family.isEmpty())
-				family = QApplication::font().family();
-			if (!size)
-				size = QApplication::font().pointSize();
-			
-			p->setFont( QFont(family, size, weight, italic) );			
-		}	
-
-		object = elem.namedItem("FRAME").toElement();
-		if (!object.isNull()) { //frame-section exists
-			const bool enabled = object.hasAttribute("enabled") ? object.attribute("enabled").toInt() : false;			
-			p->setFrameEnabled(enabled);
-			if (Format::Frame* frame = p->frame()) {
-				const QColor color = object.hasAttribute("color") ? QColor(object.attribute("color")) : Qt::white;
-				Qt::PenStyle style = object.hasAttribute("style") ? static_cast<Qt::PenStyle>(object.attribute("style").toInt()) : Qt::SolidLine;
-				const int thickness = object.hasAttribute("thickness") ? object.attribute("thickness").toInt() : 1;			
-				
-				frame->setColor(color);
-				frame->setLineStyle(style);
-				frame->setThickness(thickness);
-			}
-		}
-		elem = elem.nextSibling().toElement();	
-	}
-	return true;
-}
-
-const bool CStyle::saveToFile( const QString& filename ){
-/* Saved file should look like this:
-
- <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE DOC >
- <BibleTimePrintingStyle syntaxVersion="1" name="Standard" translate="1">
-  <HEADER enabled="1" alignment="center">
-    <COLORS bgcolor="black" fgcolor="white">
-    <FONT family="Arial" charset="2" pointsize="10" weight="1" italic="0">
-    <FRAME enabled="1" color="blue" style="1" thickness="2">
-  </HEADER>
-  // same for DESCRIPTION and MODULETEXT
-
- </BibleTimePrintingStyle>
-*/
-	bool ret = false;
-	
-  QDomDocument doc("DOC");
-  doc.appendChild( doc.createProcessingInstruction( "xml", "version=\"1.0\" encoding=\"UTF-8\"" ) );
-
-  QDomElement content = doc.createElement("BibleTimePrintingStyle");
-  content.setAttribute("syntaxVersion", CURRENT_SYNTAX_VERSION);
-  content.setAttribute("name", m_name);
-  content.setAttribute("translate", 0); //don't trabslate styles except of prinstalled ones
-  doc.appendChild(content);
-
-  for (unsigned int i = Header; i <= ModuleText; ++i) {
-		QDomElement elem;
-			
-		const StyleType type = static_cast<StyleType>(i);
-		switch (type) {
-			case Header:
-				elem = doc.createElement("HEADER");
-				break;
-			case Description:
-				elem = doc.createElement("DESCRIPTION");			
-				break;
-			case ModuleText:
-				elem = doc.createElement("MODULETEXT");
-				break;
-			default:
-				break;
-		};		
-		if (elem.isNull()) //shouldn't happen
-			continue;
-		content.appendChild(elem);
-			
-		Format* format = formatForType(type);			
-		
-		elem.setAttribute("enabled", hasFormatTypeEnabled(type));
-		elem.setAttribute("alignment", static_cast<int>(format->alignment()));
-		
-		QDomElement object = doc.createElement("COLORS");
-		object.setAttribute("bgcolor", format->color(Format::Background).name());
-		object.setAttribute("fgcolor", format->color(Format::Foreground).name());
-		elem.appendChild(object);		
-				
-		QFont font = format->font();
-		object = doc.createElement("FONT");
-		object.setAttribute("family", font.family());
-		object.setAttribute("pointsize", font.pointSize());		
-		object.setAttribute("weight", font.weight());
-		object.setAttribute("italic", font.italic());
-		elem.appendChild(object);
-						
-		object = doc.createElement("FRAME");		
-		Format::Frame* frame = format->frame();
-		object.setAttribute("enabled", static_cast<bool>(frame) );
-		if (frame) {
-			object.setAttribute("color", frame->color().name());
-			object.setAttribute("thickness", frame->thickness());
-			object.setAttribute("style", static_cast<int>(frame->lineStyle()) );
-    }		
-		elem.appendChild(object);
-  };
-  ret = false;
-
-
-	QFile file(filename);
-	if (file.open(IO_WriteOnly)) {
-		ret = true;
-		QTextStream t( &file );        // use a text stream
-		t.setEncoding(QTextStream::UnicodeUTF8);
-		t << doc.toString();
-		file.close();
-	}
-	return ret;
-}
diff --git a/bibletime/printing/cstyle.h b/bibletime/printing/cstyle.h
deleted file mode 100644
index 9ad385f..0000000
--- a/bibletime/printing/cstyle.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/***************************************************************************
-                          cstyle.h  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-#include "cprinter.h"
-
-//Qt includes
-#include <qlistview.h>
-#include <qptrlist.h>
-
-
-#ifndef CSTYLE_H
-#define CSTYLE_H
-
-//forward class decalarations
-class CStyleList;
-class CStyle;
-
-class QListViewItem;
-class QListView;
-
-typedef QPtrList<CStyle> StyleItemList;
-
-/** The class containing the properties requiredfor prinitng styles.
-  * @author The BibleTime team
-  */
-class CStyle {
-public:
-
-	enum StyleType {
-		Header = 0, /** The header displayed over each printed item */
-		Description = 1 /** The description, used in bookmarks for example */,
-		ModuleText = 2 /** The real text of the entry or the range of verses */,
-		Unknown /** Unknown for us, should not be used */
-	};
-
-	/**	
-  * A class which contains methods to support a format for the CStyle class.
-  *	@author The BibleTime team
-  * @version $Id: cstyle.h,v 1.17 2003/02/20 21:52:08 mgruner Exp $
-  */
-  class Format {
-  public:
-    class Frame  {
-    public:
-    	Frame();
-			Frame(const Frame& f);
-      /**
-      * Sets the color of this frame.
-      */
-      void setColor( const QColor& );
-      /**
-      * Returns the color of this frame.
-      */
-      const QColor& color() const;
-      /**
-      * Sets the style how to paint the lines.
-      */
-      void setLineStyle( const Qt::PenStyle );
-    	/**
-      * Returns the style how to paint the lines of this frame.
-      */
-      const Qt::PenStyle& lineStyle() const;
-      /**
-      * Sets te thickness of this frame.
-      */
-      void setThickness( const int );
-      /**
-      * Returns the thickness of this frame.
-      */
-      const int& thickness() const;
-
-    private:
-    	QColor m_color;
-    	Qt::PenStyle m_lineStyle;
-    	int m_thickness;	
-    };
-
-  	enum Alignment { Left, Center, Right, Justification};
-  	enum Color { Background, Foreground };
-    	
-  	Format(const CStyle::StyleType type = CStyle::Unknown);
-  	Format(const Format& f);
-  	~Format();
-    const CStyle::StyleType type() const;
-    /**
-   	* Returns the foreground color of this format.
-   	*/
-  	const QColor& color( const Color type ) const;
-    /**
-   	* Sets the background color of this format.
-   	*/
-    void setColor( const Color type,  const QColor& );
-    /**
-    * sets the font of this format.
-    */
-    void setFont( QFont );
-    /**
-    * Returns the font of this style.
-    */
-    const QFont& font() const;
-    /**
-   	* Sets the alignement flags of this style format.
-   	*/
-    void setAlignment( const CStyle::Format::Alignment );
-    /**
-   	* Returns the alignement of this style format.
-   	*/
-    const CStyle::Format::Alignment& alignment() const;
-    /**
-   	* Sets the frame of this style.
-   	*/
-    void setFrameEnabled( const bool hasFrame );
-    /**
-   	* Returns the frame if we have one. Otherwise we return 0.
-   	*/
-    Frame* const frame();
-
-  private:
-    void clearData();
-      	
-  	QFont m_font;
-  	QColor m_FGColor;
-  	QColor m_BGColor;
-  	bool m_hasFrame;
-  	Frame* m_frame;
-  	Alignment m_alignment;
-   	CStyle::StyleType m_type;  	
-  };
-	
-	CStyle(); //standard constructor, doesn't load from file
-	virtual ~CStyle();
-  /**
- 	* Returns the proper CStyleFormat for the given type.
- 	*/
-  CStyle::Format* const formatForType( const CStyle::StyleType );
-  /**
- 	* Set the printing of the header (true enables it).
- 	*/
-  void setFormatTypeEnabled( const CStyle::StyleType, const bool );
-  /**
- 	* Returns true if we have the given type enabled.
- 	*/
-  const bool hasFormatTypeEnabled( const CStyle::StyleType ) const;
-  /**
- 	* Returns a QListViewItem for inserted in list.
- 	*/
-  QListViewItem* const listViewItem( CStyleList* const list = 0 );
-  /**
- 	* Sets the name of the style.
- 	*/
-  void setStyleName( const QString name );
-  /**
- 	* Returns the style name
- 	*/
-  const QString& styleName() const;
-  /**
- 	* Updates the Listview items
- 	*/
-  void updateListViewItem();
-  /**
- 	* Deletes the list view item.
- 	*/
-  void deleteListViewItem();
-  /**
-  * Loads the style from a XML file.
-  */
-  const bool loadFromText(const QString& text);
-  const bool loadFromFile(const QString& file);
-  /**
-  * Saves the style to the XML file.
-  */
-  const bool saveToFile( const QString& file );
-
-protected:
-	friend class CPrinter;
-	CStyle( const QString filename );
-
-private:
-  /**
- 	* Clears all variables and sets them back
- 	*/
-  void clearData();
-	
-	QString	m_name;
-	
-  Format* m_headerFormat;
-	Format* m_descriptionFormat;		
-	Format* m_moduleTextFormat;
-	
-	bool m_isHeaderFormatEnabled;
-	bool m_isModuleTextFormatEnabled;
-	bool m_isDescriptionFormatEnabled;
-	
-	QListViewItem*	m_listViewItem;
-};
-
-/** Set the printing of the header (true enables it). */
-inline const bool CStyle::hasFormatTypeEnabled( const CStyle::StyleType type) const {
-	switch (type) {
-		case Header:
-			return m_isHeaderFormatEnabled;
-		case Description:
-			return m_isDescriptionFormatEnabled;
-		case ModuleText:
-			return m_isModuleTextFormatEnabled;
-		default:
-			return false;
-	}
-}
-
-#endif
diff --git a/bibletime/printing/cstyleeditordialog.cpp b/bibletime/printing/cstyleeditordialog.cpp
deleted file mode 100644
index 9f2dbc3..0000000
--- a/bibletime/printing/cstyleeditordialog.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-/***************************************************************************
-                          cstyleeditordialog.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cstyleeditordialog.h"
-
-//KDE includes
-#include <kcombobox.h>
-#include <klocale.h>
-#include <kcolorbutton.h>
-#include <kfontdialog.h>
-
-//Qt includes
-#include <qlineedit.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qcheckbox.h>
-#include <qwidget.h>
-#include <qbuttongroup.h>
-#include <qvbuttongroup.h>
-#include <qhbuttongroup.h>
-#include <qradiobutton.h>
-#include <qspinbox.h>
-
-CStyleEditorDialog::CStyleEditorDialog(CStyle* style, QWidget *parent, const char *name )
-	: KDialogBase(parent,name, true, i18n("Style editor")) {
-	m_style = style;
-	m_formatEnabled =  false;
-	
-	initView();	
-	readSettings();	
-	styleTypeChanged("Header");
-}
-
-CStyleEditorDialog::~CStyleEditorDialog(){
-	saveSettings();
-}
-
-/** Initializes te view. */
-void CStyleEditorDialog::initView(){
-  enableButtonSeparator( true );
-  QFrame *mainWidget = makeMainWidget();
-  QLabel* label = 0;
-
-  QVBoxLayout *topLayout = new QVBoxLayout( mainWidget, 5, 5 );
-	
-	QHBoxLayout *hboxLayout = new QHBoxLayout(0, 5, 5);
-  m_styleNameEdit = new QLineEdit( mainWidget );
-	label = new QLabel(m_styleNameEdit, i18n("Name:"), this);
-	hboxLayout->addWidget(label);
-	hboxLayout->addWidget(m_styleNameEdit);	
-
-  topLayout->addLayout(hboxLayout);
-
-	hboxLayout = new QHBoxLayout(0, 5, 5);	
-  m_styleTypeChooser = new KComboBox( mainWidget, "styleTypeChooser" );
-  label = new QLabel( m_styleTypeChooser, i18n("Choose a part of the style:"), mainWidget );
-  hboxLayout->addWidget(label);
-  m_styleTypeChooser->insertItem( i18n("Header") );
-  m_styleTypeChooser->insertItem( i18n("Description") );
-  m_styleTypeChooser->insertItem( i18n("Module text") );
-  connect(m_styleTypeChooser, SIGNAL(activated(const QString&)), SLOT(styleTypeChanged(const QString&)));
-  m_currentFormat = m_style->formatForType( CStyle::Header );
-  hboxLayout->addWidget( m_styleTypeChooser );
-
-  m_setEnabledBox = new QCheckBox( mainWidget );
-  m_setEnabledBox->setText( i18n("Enable this part"));
-  connect( m_setEnabledBox, SIGNAL(clicked()), SLOT(enableBoxClicked()));
-  hboxLayout->addWidget( m_setEnabledBox );
-
-  topLayout->addLayout( hboxLayout );
-
-
-	hboxLayout = new QHBoxLayout(0, 5, 5);
-	topLayout->addLayout(hboxLayout);
-
-  m_alignRadios.buttongroup = new QVButtonGroup( mainWidget );
-	m_alignRadios.leftRB = new QRadioButton( i18n("Left"), m_alignRadios.buttongroup);
-	m_alignRadios.centerRB = new QRadioButton( i18n("Center"), m_alignRadios.buttongroup);
-	m_alignRadios.rightRB = new QRadioButton(i18n("Right"),m_alignRadios.buttongroup);
-	m_alignRadios.buttongroup->setFixedHeight( m_alignRadios.buttongroup->sizeHint().height());
-  hboxLayout->addWidget( m_alignRadios.buttongroup );
-
-	QButtonGroup* box = new QButtonGroup( mainWidget );
-	QVBoxLayout* boxLayout = new QVBoxLayout( box, 5, 5 );
-	
-	QHBoxLayout* layout1 = new QHBoxLayout(0, 1, 1);
-	m_colors.foregroundChooser = new KColorButton( box );
-	label = new QLabel(m_colors.foregroundChooser, "label", box);
-	label->setText(i18n("Foreground:"));	
-	layout1->addWidget(label);
-  layout1->addStretch(2);	
-	layout1->addWidget(m_colors.foregroundChooser);
-  	
-  boxLayout->addLayout(layout1);
-  boxLayout->addStretch(3);
-  	
-	layout1 = new QHBoxLayout(0, 1, 1);
-	m_colors.backgroundChooser = new KColorButton(box);
-	label = new QLabel(m_colors.backgroundChooser, "label", box);
-	label->setText(i18n("Background:"));
-	layout1->addWidget(label);	
-  layout1->addStretch(2);	
-	layout1->addWidget(m_colors.backgroundChooser);
-    	
-  boxLayout->addLayout(layout1);
-  boxLayout->addStretch(3);
-  hboxLayout->addWidget(box);
-
-  hboxLayout = new QHBoxLayout();
-	m_font.fontButton = new QPushButton(mainWidget);
-	m_font.fontButton->setText(i18n("Choose font"));
-	connect(m_font.fontButton, SIGNAL(clicked()), SLOT(showFontChooser()));	
-  m_font.fontDisplay = new QLabel(m_font.fontButton, "", mainWidget);	
-  m_font.fontDisplay->setText(i18n("Font preview"));
-  hboxLayout->addWidget(m_font.fontDisplay);
-  hboxLayout->addWidget(m_font.fontButton);
-
-//  m_font.identation = new QSpinBox(mainWidget);
-//  label = new QLabel(m_font.identation, "identation", mainWidget);
-//  label->setText(i18n("Identation (in mm):"));
-//  hboxLayout->addStretch(2);
-//  hboxLayout->addWidget(label);
-//  hboxLayout->addWidget(m_font.identation);
-
-  topLayout->addLayout(hboxLayout);
-
-  m_frame.useFrame = new QCheckBox(mainWidget);
-  m_frame.useFrame->setText( i18n("Use frame") );
-  topLayout->addWidget(m_frame.useFrame);
-  connect(m_frame.useFrame, SIGNAL(clicked()), SLOT(useFrameClicked()));
-
-  m_frame.groupbox = new QGroupBox(mainWidget);
-	boxLayout = new QVBoxLayout(m_frame.groupbox);
-	
-	hboxLayout = new QHBoxLayout();
-  m_frame.lineThicknessChooser = new QSpinBox( m_frame.groupbox );
-  m_frame.lineThicknessChooser->setMinValue(1);
-  label = new QLabel(m_frame.lineThicknessChooser, "label", m_frame.groupbox);
-  label->setText( i18n("Line thickness (pt):") );
-  hboxLayout->addWidget(label);
-	hboxLayout->addWidget(m_frame.lineThicknessChooser);	
-	boxLayout->addLayout(hboxLayout);
-	
-	hboxLayout = new QHBoxLayout();
-	m_frame.colorChooser = new KColorButton(m_frame.groupbox);
-	label = new QLabel(m_frame.colorChooser, "", m_frame.groupbox);
-	label->setText(i18n("Frame color:"));
-	hboxLayout->addWidget(label);
-	hboxLayout->addWidget(m_frame.colorChooser);
-	boxLayout->addLayout(hboxLayout);
-
-	hboxLayout = new QHBoxLayout();
-	m_frame.lineStyleChooser = new QComboBox(m_frame.groupbox);
-	label = new QLabel(m_frame.lineStyleChooser, "", m_frame.groupbox);
-	label->setText(i18n("Line style:"));
-	hboxLayout->addWidget(label);
-	hboxLayout->addWidget(m_frame.lineStyleChooser);
-	boxLayout->addLayout(hboxLayout);
-			
-	topLayout->addWidget(m_frame.groupbox);
-	topLayout->addStretch(3);
-	
-	QPainter p;
-	QPen pen(Qt::black, 2, Qt::SolidLine);
-	QBrush brush(Qt::white);		
-	for (int i=1; i <= 5; i++) {  // from Qt::SolidLine to Qt::DashDotDotLine
-		QPixmap* pix = new QPixmap(/*m_frame.lineStyleChooser->width()*/150,15);
-		pen.setStyle((Qt::PenStyle)i);
-		p.begin(pix);
-		p.setPen(pen);
-		p.fillRect(0,0, pix->width(), pix->height(), brush);
-		p.drawLine(0,(int)((float)pix->height()/2),pix->width(),(int)((float)pix->height()/2));
-		p.end();
-		m_frame.lineStyleChooser->insertItem(*pix);	
-	}
-	
-	m_currentFormat = m_style->formatForType( CStyle::Header );	
-	setupWithFormat( m_currentFormat );
-	enableBoxClicked();
-}
-
-/** Reads settings from config file */
-void CStyleEditorDialog::readSettings(){
-	m_styleNameEdit->setText( m_style->styleName() );
-	if (m_styleNameEdit->text() == i18n("Standard"))
-		m_styleNameEdit->setEnabled(false);	//you can't change the name of the standard style
-}
-
-/** Saves settings to config file. */
-void CStyleEditorDialog::saveSettings(){
-	applySettingsToFormat( m_currentFormat );
-//  m_style->setFormatForType(m_currentFormat.type(), m_currentFormat );
-  m_style->setStyleName( m_styleNameEdit->text() );	
-}
-
-/** Opens the font chooser dialog. */
-void CStyleEditorDialog::showFontChooser(){
-	int result = KFontDialog::getFont( m_font.font );
-	if ( result == KFontDialog::Accepted ) {
-		setupFontWidgets( m_font.font );
-	}
-}
-
-/**  */
-void CStyleEditorDialog::useFrameClicked(){
-	m_frame.groupbox->setEnabled( m_frame.useFrame->isChecked() );
-}
-
-/** Sets up the states of the child widgets using the styl format given as parameter. */
-void CStyleEditorDialog::setupWithFormat( CStyle::Format* const format ){
-	const CStyle::StyleType type = format->type();
-	if (type == CStyle::Unknown)
-		return;
-	m_formatEnabled = m_style->hasFormatTypeEnabled(type);
-	
-  m_styleNameEdit->setText( m_style->styleName());	
-	//setup alignement
-	switch(format->alignment()) {
-		case CStyle::Format::Left:
-			m_alignRadios.leftRB->setChecked(true);
-			break;
-		case CStyle::Format::Center:
-			m_alignRadios.centerRB->setChecked(true);
-			break;
-		case CStyle::Format::Right:
-			m_alignRadios.rightRB->setChecked(true);
-			break;
-		default:
-			m_alignRadios.leftRB->setChecked(true);
-			break;
-	}
-	m_alignRadios.buttongroup->setEnabled(m_formatEnabled);	
-	m_setEnabledBox->setChecked(m_formatEnabled);
-	
-	//setup colors
-	m_colors.backgroundChooser->setColor( format->color( CStyle::Format::Background ) );
-	m_colors.backgroundChooser->setEnabled(m_formatEnabled);		
-	
-	m_colors.foregroundChooser->setColor( format->color( CStyle::Format::Foreground ) );
-	m_colors.foregroundChooser->setEnabled(m_formatEnabled);
-		
-	//setup fonts
-	m_font.font = format->font();
-	setupFontWidgets( m_font.font );
-	
-	//setup frame part
-	CStyle::Format::Frame* frame = format->frame();
-	m_frame.useFrame->setChecked(frame);
-	m_frame.useFrame->setEnabled(m_formatEnabled);		
-	useFrameClicked();
-	
-	if (frame) {
-		m_frame.colorChooser->setColor( frame->color() );
-		m_frame.lineThicknessChooser->setValue( frame->thickness() );	
-		m_frame.lineStyleChooser->setCurrentItem((int)(frame->lineStyle())-1);
-	}
-	
-	m_frame.groupbox->setEnabled(m_formatEnabled);			
-}
-
-/** Setups the font widgets using the parameter. */
-void CStyleEditorDialog::setupFontWidgets( QFont& font ){
-	QFont dummy(font);
-	dummy.setPointSize(12);
-	m_font.fontDisplay->setFont( dummy );
-	m_font.fontDisplay->setText( QString::fromLatin1("%1 - %2").arg(m_font.font.family()).arg(m_font.font.pointSize()) );
-	m_font.fontDisplay->setEnabled(m_formatEnabled);	
-	m_font.fontButton->setEnabled(m_formatEnabled);
-}
-
-/** Called when the type was changed in the combobox. */
-void CStyleEditorDialog::styleTypeChanged( const QString& name ){
-	applySettingsToFormat( m_currentFormat );
-	if (name == i18n("Header")) {
-		m_currentFormat = m_style->formatForType(CStyle::Header );
-		m_formatEnabled = m_style->hasFormatTypeEnabled( CStyle::Header );
-	}
-	else 	if (name == i18n("Description")) {
-		m_currentFormat = m_style->formatForType( CStyle::Description );
-		m_formatEnabled = m_style->hasFormatTypeEnabled( CStyle::Description );
-	}
-	else 	if (name == i18n("Module text")) {
-		m_currentFormat = m_style->formatForType(CStyle::ModuleText );	
-		m_formatEnabled = m_style->hasFormatTypeEnabled( CStyle::ModuleText );	
-	}
-	setupWithFormat( m_currentFormat );
-}
-
-/** Sets the properties of the cuzrrent format which are changed in the editor. */
-void CStyleEditorDialog::applySettingsToFormat( CStyle::Format* const format ){
-	m_style->setStyleName(m_styleNameEdit->text());
-	
-	//apply alignement settings
-	if (m_alignRadios.buttongroup->selected() == m_alignRadios.leftRB ) {
-		format->setAlignment( CStyle::Format::Left);
-	}
-	else if (m_alignRadios.buttongroup->selected() == m_alignRadios.centerRB) {
-		format->setAlignment( CStyle::Format::Center );
-	}
-	else if (m_alignRadios.buttongroup->selected() == m_alignRadios.rightRB ) {
-		format->setAlignment( CStyle::Format::Right );
-	}
-	
-	//apply color settings
-	format->setColor( CStyle::Format::Background, m_colors.backgroundChooser->color() );
-	format->setColor( CStyle::Format::Foreground, m_colors.foregroundChooser->color() );
-	
-	//apply font settings
-	format->setFont( m_font.font );
-	
-	//apply frame settings
-	format->setFrameEnabled( m_frame.useFrame->isChecked() );	
-	if (CStyle::Format::Frame* frame = format->frame()){
-		frame->setColor( m_frame.colorChooser->color() );	
-		frame->setThickness( m_frame.lineThicknessChooser->value() );
-		
-		//the position in the list equal to the position in Qt::PenStyle+1
-		frame->setLineStyle(static_cast<Qt::PenStyle>(m_frame.lineStyleChooser->currentItem()+1));
-	}
-}
-
-/** Is called when the enablePart box was clicked. */
-void CStyleEditorDialog::enableBoxClicked() {
-	const CStyle::StyleType styleType = m_currentFormat->type();		
-	m_style->setFormatTypeEnabled(styleType, m_setEnabledBox->isChecked());	
-	
-	applySettingsToFormat(m_style->formatForType(styleType));
-	setupWithFormat( m_currentFormat );
-}
diff --git a/bibletime/printing/cstyleeditordialog.h b/bibletime/printing/cstyleeditordialog.h
deleted file mode 100644
index 1bc124d..0000000
--- a/bibletime/printing/cstyleeditordialog.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/***************************************************************************
-                          cstyleeditordialog.h  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSTYLEEDITORDIALOG_H
-#define CSTYLEEDITORDIALOG_H
-
-//BibleTime includes
-#include "cstyle.h"
-
-//QT includes
-#include <qwidget.h>
-
-//KDE inludes
-#include <kdialogbase.h>
-#include "cstyle.h"
-
-
-/**The editor for the printing styles.
-  *@author The BibleTime team
-  */
-class QLineEdit;
-class KComboBox;
-class QRadioButton;
-class QSpinBox;
-class KFontDialog;
-class KColorButton;
-class QVButtonGroup;
-class QHButtonGroup;
-class QCheckBox;
-class QComboBox;
-class QGroupBox;
-
-class CStyleEditorDialog : public KDialogBase  {
-   Q_OBJECT
-public: 
-	CStyleEditorDialog(CStyle* style, QWidget *parent=0, const char *name=0);
-	~CStyleEditorDialog();
-
-protected: // Protected methods
-  /**
-  * Saves settings to config file.
-  */
-  void saveSettings();
-  /**
-  * Reads settings from config file
-  */
-  void readSettings();
-	/**
-  * Initializes te view.
-  */
-  void initView();
-
-protected slots:
-  /**
-  * Opens the font chooser dialog.
-  */
-  void showFontChooser();
-  /**
-  *
-  */
-  void useFrameClicked();
-  /**
- 	* Setups the font widgets using the parameter.
- 	*/
-  void setupFontWidgets( QFont& font );
-  /**
-  * Sets up the states of the child widgets using the styl format given as parameter.
-  */
-  void applySettingsToFormat( CStyle::Format* const format );  	
-  /**
-  * Sets the properties of the cuzrrent format which are changed in the editor.
-  */
-  void setupWithFormat( CStyle::Format* const format );
-  /**
-  * Is called when the enablePart box was clicked.
-  */
-  void enableBoxClicked();
-  /**
-  * Called when the type was changed in the combobox.
-  */
-  void styleTypeChanged( const QString& );
-
-private:
-	struct alignementRadios {
-		QRadioButton*	leftRB;
-		QRadioButton*	centerRB;
-		QRadioButton*	rightRB;
-		QVButtonGroup*	buttongroup;
-	} m_alignRadios;
-	
-	struct colorButtons {
-		KColorButton*	foregroundChooser;
-		KColorButton*	backgroundChooser;
-	} m_colors;
-	
-	struct frameWidgets {
-		QCheckBox*	useFrame;
-		KColorButton*	colorChooser;
-		QSpinBox* lineThicknessChooser;
-		QComboBox* lineStyleChooser;		
-		QGroupBox*	groupbox;
-	} m_frame;
-	
-	struct fontWidgets {
-		QFont font;
-		QPushButton* fontButton;
-		QLabel*	fontDisplay;
-	} m_font;
-	
-
-  QLineEdit*	m_styleNameEdit;
-  KComboBox*	m_styleTypeChooser;
-	CStyle*	m_style;
-	CStyle::Format* m_currentFormat;
-	QCheckBox*	m_setEnabledBox;
-
-
-	bool m_formatEnabled;
-};
-
-#endif
diff --git a/bibletime/printing/cstylelist.cpp b/bibletime/printing/cstylelist.cpp
deleted file mode 100644
index 9d1f604..0000000
--- a/bibletime/printing/cstylelist.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-/***************************************************************************
-                          cstylelist.cpp  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cstylelist.h"
-#include "cstyleeditordialog.h"
-
-#include <qheader.h>
-#include <qlistview.h>
-#include <qcombobox.h>
-
-#include <klocale.h>
-#include <kaction.h>
-#include <kiconloader.h>
-
-CStyleList::CStyleList(StyleItemList* items, QWidget *parent, const char *name )
-	: KListView(parent,name), m_items(items)
-{
-	initView();	
-	setItems(m_items);	
-}
-
-CStyleList::~CStyleList(){
-	for (m_items->first(); m_items->current(); m_items->next()) {
-		m_items->current()->deleteListViewItem();
-	}
-}
-
-/** Initilizes the view. */
-void CStyleList::initView(){
-	addColumn(i18n("Name:"));
-	header()->hide();
-}
-
-/** Sets the content to itemList */
-void CStyleList::insertItems( StyleItemList* itemList ){
-	for(itemList->first(); itemList->current(); itemList->next() ) {
-		if (itemList != m_items)	//check if we do not insert our own m_items list
-			m_items->append( itemList->current() );
-		itemList->current()->listViewItem(this);
-	}
-	printer()->emitStylesChanged();
-}
-
-/** Appends the items of itemList */
-void CStyleList::setItems( StyleItemList* itemList ){
-	for (m_items->first(); m_items->current(); m_items->next()) {
-		if (m_items->current())
-			m_items->current()->deleteListViewItem();
-	}
-
-	if (m_items != itemList)
-		m_items->clear();
-	insertItems(m_items);	
-
-	QListViewItemIterator it( this );
-	if (it.current())
-		setCurrentItem(it.current());
-	emit currentChanged(it.current());
-}
-
-/** Appends the item to the list and m_items. */
-void CStyleList::insertItem( CStyle* item ){
-	m_items->append( item );
-	item->listViewItem(this);
-}
-
-/** Opens the style editor dialog for he selected style. */
-void CStyleList::editCurrentStyle(){
-	QListViewItem*	item = currentItem();
-	if (!item)
-		return;
-		
-	//go through style items and find the right one
-	CStyle*	currentStyle = 0;
-	for (m_items->first(); m_items->current();m_items->next()) {
-		if (m_items->current()->listViewItem() == item) {
-			currentStyle = m_items->current();
-			break;
-		}
-	}
-	if (currentStyle) {
-		openStyleEditor( currentStyle );		
-		currentStyle->updateListViewItem();
-	}
-}
-
-/** Creates a new style item. */
-void CStyleList::createNewStyle(){
-	CStyle*	style = new CStyle();	
-	insertItem( style );
-	
-	openStyleEditor( style );
-	
-	style->updateListViewItem();
-}
-
-/**  */
-void CStyleList::openStyleEditor( CStyle* const style ){
-	CStyleEditorDialog dlg(style, this);
-	dlg.exec();
-	printer()->emitStylesChanged();
-}
-
-/** Deletes the current style item. */
-void CStyleList::deleteCurrentStyle(){
-	QListViewItem* item = currentItem();
-	if (!item)
-		return;
-	if (item == printer()->standardStyle()->listViewItem()) {
-		qWarning("Deleting the standardstyle is not possible");
-		return;
-	}
-	
-	//go through style items and find the right one
-	CStyle*	currentStyle = 0;
-	for (m_items->first(); m_items->current();m_items->next()) {
-		if (m_items->current()->listViewItem() == item) {
-			currentStyle = m_items->current();
-      const int pos = m_items->findRef(currentStyle);
-			if (pos != -1)
-        m_items->take(pos);
-			currentStyle->deleteListViewItem();			
-			if (!m_items->autoDelete() && currentStyle) {
-				delete currentStyle;			
-				currentStyle = 0;
-			}	
-			if (printer())
-				printer()->emitStylesChanged();
-			return;
-		}
-	}
-}
-
-/** Returns a pointer to our list */
-StyleItemList* const CStyleList::styleList() const {
-	return m_items;
-}
-
diff --git a/bibletime/printing/cstylelist.h b/bibletime/printing/cstylelist.h
deleted file mode 100644
index 0e68dc8..0000000
--- a/bibletime/printing/cstylelist.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/***************************************************************************
-                          cstylelist.h  -  description
-                             -------------------
-    begin                : Sun Aug 20 2000
-    copyright            : (C) 2000 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CSTYLELIST_H
-#define CSTYLELIST_H
-
-//BibleTime includes
-#include "util/cpointers.h"
-#include "cstyle.h"
-
-
-//Qt includes
-#include <qwidget.h>
-#include <qptrlist.h>
-
-//KDE includes
-#include <klistview.h>
-#include <kpopupmenu.h>
-
-class KAction;
-class QComboBox;
-
-typedef QPtrList<CStyle> styleList;
-
-  /** A KListView derived class which handles CStyle items.
-  * @author The BibleTime team
-  */
-class CStyleList : public KListView, public CPointers   {
-   Q_OBJECT
-public:
-	CStyleList(StyleItemList* items, QWidget *parent=0, const char *name=0);
-	~CStyleList();
-  /**
- 	* Initilizes the view.
- 	*/
-  void initView();
-  /**
- 	* Appends the items of itemList
- 	*/
-  void insertItems( StyleItemList* itemList );
-  /**
- 	* Sets the content to itemList
- 	*/
-  void setItems( StyleItemList* itemList );
-  /**
- 	*
- 	*/
-  void openStyleEditor( CStyle* const style );
-  /**
- 	* Appends the item to the list and m_items.
- 	*/
-  void insertItem( CStyle* item);
-  /**
- 	*
- 	*/
-  StyleItemList* const styleList() const;
-
-public slots: // Public slots
-  /**
- 	* Deletes the current style item.
- 	*/
-  void deleteCurrentStyle();
-  /**
- 	* Creates a new style item.
- 	*/
-  void createNewStyle();
-  /**
- 	* Opens the style editor dialog for he selected style.
- 	*/
-  void editCurrentStyle();
-
-private:
-	StyleItemList* m_items;
-	QGuardedPtr<KAction> editStyle_action;
-	QGuardedPtr<KAction> deleteStyle_action;
-};
-
-#endif
diff --git a/bibletime/util/Makefile.am b/bibletime/util/Makefile.am
deleted file mode 100644
index c96f870..0000000
--- a/bibletime/util/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDES = $(all_includes)
-libutil_a_METASOURCES = AUTO
-noinst_LIBRARIES = libutil.a
-
-libutil_a_SOURCES = \
-cpointers.cpp \
-cresmgr.cpp \
-ctoolclass.cpp
-
-all_headers = \
-scoped_resource.h \
-cpointers.h \
-cresmgr.h \
-ctoolclass.h
-
-EXTRA_DIST = $(libutil_a_SOURCES) $(all_headers)
diff --git a/bibletime/util/Makefile.in b/bibletime/util/Makefile.in
deleted file mode 100644
index 473bddd..0000000
--- a/bibletime/util/Makefile.in
+++ /dev/null
@@ -1,679 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-INCLUDES = $(all_includes)
-#>- libutil_a_METASOURCES = AUTO
-noinst_LIBRARIES = libutil.a
-
-libutil_a_SOURCES = \
-cpointers.cpp \
-cresmgr.cpp \
-ctoolclass.cpp
-
-
-all_headers = \
-scoped_resource.h \
-cpointers.h \
-cresmgr.h \
-ctoolclass.h
-
-
-EXTRA_DIST = $(libutil_a_SOURCES) $(all_headers)
-subdir = bibletime/util
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libutil_a_AR = $(AR) cru
-libutil_a_LIBADD =
-am_libutil_a_OBJECTS = cpointers.$(OBJEXT) cresmgr.$(OBJEXT) \
-	ctoolclass.$(OBJEXT)
-#>- libutil_a_OBJECTS = $(am_libutil_a_OBJECTS)
-#>+ 5
-libutil_a_final_OBJECTS = libutil_a.all_cpp.o 
-libutil_a_nofinal_OBJECTS = cpointers.$(OBJEXT) cresmgr.$(OBJEXT) \
-	ctoolclass.$(OBJEXT)
-@KDE_USE_FINAL_FALSE@libutil_a_OBJECTS = $(libutil_a_nofinal_OBJECTS)
-@KDE_USE_FINAL_TRUE@libutil_a_OBJECTS = $(libutil_a_final_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpointers.Po ./$(DEPDIR)/cresmgr.Po \
-#>- @AMDEP_TRUE@	./$(DEPDIR)/ctoolclass.Po
-#>+ 4
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@DEP_FILES =   $(DEPDIR)/libutil_a.all_cpp.P ./$(DEPDIR)/cpointers.Po ./$(DEPDIR)/cresmgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/ctoolclass.Po
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@DEP_FILES =  ./$(DEPDIR)/cpointers.Po ./$(DEPDIR)/cresmgr.Po \
-@AMDEP_TRUE@@KDE_USE_FINAL_FALSE@	@AMDEP_TRUE@	./$(DEPDIR)/ctoolclass.Po
-#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 2
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-#>+ 3
-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-CXXLD = $(CXX)
-#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-#>+ 2
-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libutil_a_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libutil_a_SOURCES)
-
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/util/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/util/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/util/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libutil.a: $(libutil_a_OBJECTS) $(libutil_a_DEPENDENCIES) 
-	-rm -f libutil.a
-	$(libutil_a_AR) libutil.a $(libutil_a_OBJECTS) $(libutil_a_LIBADD)
-	$(RANLIB) libutil.a
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpointers.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cresmgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctoolclass.Po@am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCXX_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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:  $(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 "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-ctags: CTAGS
-CTAGS:  $(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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
-#>- 	mostlyclean-am
-#>+ 2
-clean-am: clean-bcheck clean-final  clean-generic clean-libtool clean-noinstLIBRARIES \
-	mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-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
-
-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-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-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.
-.NOEXPORT:
-
-#>+ 2
-KDE_DIST=cresmgr.h scoped_resource.h ctoolclass.h cpointers.h 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/util/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/util/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXXCOMPILE)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 11
-libutil_a.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cpointers.cpp $(srcdir)/cresmgr.cpp $(srcdir)/ctoolclass.cpp 
-	@echo 'creating libutil_a.all_cpp.cpp ...'; \
-	rm -f libutil_a.all_cpp.files libutil_a.all_cpp.final; \
-	echo "#define KDE_USE_FINAL 1" >> libutil_a.all_cpp.final; \
-	for file in cpointers.cpp cresmgr.cpp ctoolclass.cpp ; do \
-	  echo "#include \"$$file\"" >> libutil_a.all_cpp.files; \
-	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> libutil_a.all_cpp.final; \
-	done; \
-	cat libutil_a.all_cpp.final libutil_a.all_cpp.files > libutil_a.all_cpp.cpp; \
-	rm -f libutil_a.all_cpp.final libutil_a.all_cpp.files
-
-#>+ 3
-clean-final:
-	-rm -f libutil_a.all_cpp.cpp
-
-#>+ 3
-final:
-	$(MAKE) libutil_a_OBJECTS="$(libutil_a_final_OBJECTS)" all-am
-
-#>+ 3
-final-install:
-	$(MAKE) libutil_a_OBJECTS="$(libutil_a_final_OBJECTS)" install-am
-
-#>+ 3
-no-final:
-	$(MAKE) libutil_a_OBJECTS="$(libutil_a_nofinal_OBJECTS)" all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) libutil_a_OBJECTS="$(libutil_a_nofinal_OBJECTS)" install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/util/cpointers.cpp b/bibletime/util/cpointers.cpp
deleted file mode 100644
index ea1aad3..0000000
--- a/bibletime/util/cpointers.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/***************************************************************************
-                          cpointers.cpp  -  description
-                             -------------------
-    begin                : Sun Feb 17 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#include "cpointers.h"
-
-#include "backend/cswordbackend.h"
-
-#include "printing/cprinter.h"
-
-static CSwordBackend* m_backend = 0;
-static CPrinter*      m_printer = 0;
-static CLanguageMgr*  m_langMgr = 0;
-
-
-void CPointers::setPrinter(CPrinter* const printer) {
-	m_printer = printer;
-}
-
-void CPointers::setBackend(CSwordBackend* const backend) {
-	m_backend = backend;
-}
-
-void CPointers::deletePrinter() {
-	delete m_printer;
-	m_printer = 0;
-}
-
-void CPointers::deleteBackend() {
-	delete m_backend;
-	m_backend = 0;
-}
-
-
-/** Returns a pointer to the backend ... */
-CSwordBackend* const CPointers::backend() {
-	return m_backend;
-}
-
-/** Returns a pointer to the backend ... */
-CLanguageMgr* const CPointers::languageMgr() {
-  if (!m_langMgr) {
-    m_langMgr = new CLanguageMgr();
-  }
-	return m_langMgr;
-}
-
-/** Returns a pointer to the printer object. */
-CPrinter* const CPointers::printer() {
-	return m_printer;
-}
-
diff --git a/bibletime/util/cpointers.h b/bibletime/util/cpointers.h
deleted file mode 100644
index 1cf6f15..0000000
--- a/bibletime/util/cpointers.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/***************************************************************************
-                          cpointers.h  -  description
-                             -------------------
-    begin                : Sun Feb 17 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CPOINTERS_H
-#define CPOINTERS_H
-
-//BibleTime includes
-#include "backend/clanguagemgr.h"
-
-class CSwordBackend;
-class CPrinter;
-class CLanguageMgr;
-
-/** Holds the pointers to important classes like modules, backend etc.
-  * @author The BibleTime team
-  */
-class CPointers {
-protected:
-	friend class BibleTime; //BibleTime may initialize this object
- 	friend class BibleTimeApp; //BibleTime may initialize this object	
-	friend int main(int argc, char* argv[]);
-	
-	static void setBackend(CSwordBackend* const);
-	static void setPrinter(CPrinter* const);
-	static void deleteBackend();
-	static void deletePrinter();
-
-public: // Public methods
-  /**
-  * Returns a pointer to the printer object.
-  */
-  static CPrinter* const printer();
-  /**
-  * Returns a pointer to the backend ...
-  */
-  static CSwordBackend* const backend();
-  static CLanguageMgr* const languageMgr();  
-};
-
-#endif
diff --git a/bibletime/util/cresmgr.cpp b/bibletime/util/cresmgr.cpp
deleted file mode 100644
index 4e88d62..0000000
--- a/bibletime/util/cresmgr.cpp
+++ /dev/null
@@ -1,1632 +0,0 @@
-/***************************************************************************
-                          cresmgr.cpp  -  description
-                             -------------------
-    begin                : Tue Jan 25 2000
-    copyright            : (C) 2000 by The BibleTime Team
-    email                : Info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-//own includes
-#include "cresmgr.h"
-
-#include "backend/cswordbackend.h"
-
-//KDE includes
-#include <kglobal.h>
-#include <klocale.h>
-
-inline const QString makeToolTip( const QString& text ) {
-  return text;
-};
-
-inline const QString makeWhatsThis( const QString& title, const QString& description )  {
-  return QString::fromLatin1("<center><B>%1</B></center><HR>%2").arg(title).arg(description);
-};
-
-
-
-namespace CResMgr {
-  namespace modules {
-    namespace bible {
-      const QString icon_unlocked  = "bt_bible";
-      const QString icon_locked    = "bt_bible_locked";
-      const QString icon_add       = "bt_bible_add";
-    };
-    namespace commentary {
-      const QString icon_unlocked  = "bt_commentary";
-      const QString icon_locked    = "bt_commentary_locked";
-      const QString icon_add       = "bt_commentary_add";
-    };
-    namespace lexicon {
-      const QString icon_unlocked  = "bt_lexicon";
-      const QString icon_locked    = "bt_lexicon_locked";
-      const QString icon_add       = "bt_lexicon_add";
-    };
-    namespace book {
-      const QString icon_unlocked  = "bt_book";
-      const QString icon_locked    = "bt_book_locked";
-      const QString icon_add       = "bt_book_add";
-    };
-  };
-
-  namespace mainMenu { //Main menu
-    namespace file { //Main menu->File
-      namespace clearQueue {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon       = QString::fromLatin1("button_cancel");
-        const KShortcut accel    = KKeySequence();
-        const char* actionName   = "file_clear_queue_action";
-      }
-      namespace print { //a standard action
-        QString tooltip;
-        QString whatsthis;
-      }
-      namespace quit { //a standard action
-        QString tooltip;
-        QString whatsthis;
-      }
-    }
-
-    namespace view { //Main menu->View
-      namespace showMainIndex {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "view_sidetree";
-        const KShortcut accel     = Qt::Key_F9;
-        const char* actionName    = "viewMainIndex_action";
-      }
-      namespace showToolBar { //a standard action
-        QString tooltip;
-        QString whatsthis;
-      }
-    }
-
-    namespace mainIndex { //Main menu->Settings
-      namespace search {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "find";
-        const KShortcut accel     = Qt::CTRL + Qt::ALT + Qt::Key_M;
-        const char* actionName    = "groupmanager_search_action";
-      }
-      namespace searchdefaultbible {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "find";
-        const KShortcut accel     = Qt::CTRL + Qt::Key_F;
-        const char* actionName    = "groupmanager_searchdefaultbible_action";
-      }
-    };
-
-    namespace window { //Main menu->Window
-      namespace loadProfile {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "view_sidetree";
-        const char* actionName    = "windowLoadProfile_action";
-      }
-      namespace saveProfile {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "view_sidetree";
-        const char* actionName    = "windowSaveProfile_action";
-      }
-      namespace saveToNewProfile {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "view_sidetree";
-        const KShortcut accel     = Qt::CTRL + Qt::ALT + Qt::Key_S;
-        const char* actionName    = "windowSaveToNewProfile_action";
-      }
-      namespace setupProfiles {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "view_sidetree";
-        const KShortcut accel     = KKeySequence();
-        const char* actionName    = "windowEditProfiles_action";
-      }
-      namespace showFullscreen {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "window_fullscreen";
-        const KShortcut accel     = Qt::CTRL + Qt::SHIFT + Qt::Key_F;
-        const char* actionName    = "windowFullscreen_action";
-      }
-      namespace tile {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "bt_tile";
-        const KShortcut accel     = Qt::CTRL + Qt::Key_T;
-        const char* actionName    = "windowTile_action";
-      }
-      namespace cascade {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "bt_cascade";
-        const KShortcut accel     = Qt::CTRL + Qt::Key_A;
-        const char* actionName    = "windowCascade_action";
-      }
-      namespace autoTile {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "bt_tile_auto";
-        const KShortcut accel     = Qt::CTRL + Qt::ALT + Qt::Key_T;
-        const char* actionName    = "windowAutoTile_action";
-      }
-      namespace autoCascade {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "bt_cascade_auto";
-        const KShortcut accel     = Qt::CTRL + Qt::ALT + Qt::Key_A;
-        const char* actionName    = "windowAutoCascade_action";
-      }
-      namespace closeAll {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "fileclose";
-        const KShortcut accel     = Qt::CTRL + Qt::Key_K;
-        const char* actionName    = "windowCloseAll_action";
-      }
-    }
-
-    namespace settings { //Main menu->Settings
-      namespace editToolBar { // available as KStdAction
-        QString tooltip;
-        QString whatsthis;
-      }
-      namespace optionsDialog { // available as KStdAction
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace swordSetupDialog {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "bt_swordconfig";
-        const KShortcut accel     = Qt::Key_F4;
-        const char* actionName    = "options_sword_setup";
-      }
-
-    };
-
-    namespace help { //Main menu->Help
-      namespace handbook {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "contents";
-        const KShortcut accel     = Qt::Key_F1;
-        const char* actionName    = "helpHandbook_action";
-      };
-      namespace bibleStudyHowTo {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "contents";
-        const KShortcut accel     = Qt::Key_F2;
-        const char* actionName    = "helpHowTo_action";
-      };
-      namespace whatsThis { // available as KStdAction
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace bugreport { // available as KStdAction
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace dailyTip {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "idea";
-        const KShortcut accel     = KKeySequence();
-        const char* actionName    = "helpDailyTip_action";
-      };
-      namespace aboutBibleTime { // available as KStdAction
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace aboutKDE { // available as KStdAction
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-  }  //end of main menu
-
-  namespace searchdialog {
-    const QString icon = "find";
-
-    namespace searchButton {
-      QString tooltip;
-      QString whatsthis;
-    };
-    namespace cancelSearchButton {
-      QString tooltip;
-      QString whatsthis;
-    };
-
-    namespace options {
-      namespace moduleChooserButton {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace searchedText {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace searchType {
-        namespace multipleWords_and {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace multipleWords_or {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace exactMatch {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace regExp {
-          QString tooltip;
-          QString whatsthis;
-        };
-      };
-
-      namespace searchOptions {
-        namespace caseSensitive {
-          QString tooltip;
-          QString whatsthis;
-        };
-      };
-      namespace chooseScope {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace scopeEditor {
-        namespace rangeList {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace nameEdit {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace editRange {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace parsedResult {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace addNewRange {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace deleteCurrentRange {
-          QString tooltip;
-          QString whatsthis;
-        };
-
-      };
-    }
-    namespace result {
-      namespace moduleList {
-        QString tooltip;
-        QString whatsthis;
-
-        namespace copyMenu {
-          const QString icon = "editcopy";
-        };
-        namespace saveMenu {
-          const QString icon = "filesave";
-        };
-        namespace printMenu {
-          const QString icon = "fileprint";
-        };
-      };
-      namespace foundItems {
-        QString tooltip;
-        QString whatsthis;
-
-        namespace copyMenu {
-          const QString icon = "editcopy";
-        };
-        namespace saveMenu {
-          const QString icon = "filesave";
-        };
-        namespace printMenu {
-          const QString icon = "fileprint";
-        };
-      };
-      namespace textPreview {
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-  };
-
-  namespace workspace {
-  };
-
-  namespace displaywindows {
-    namespace transliteration {
-      const QString icon = "bt_displaytranslit";
-    };
-    namespace displaySettings {
-      const QString icon = "bt_displayconfig";
-    };
-
-    namespace general {
-      namespace scrollButton {
-        QString tooltip;
-        QString whatsthis;
-
-      };
-    };
-    namespace bibleWindow {
-      namespace bookList {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace nextBook {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = Qt::CTRL + Qt::Key_B;
-       }
-      namespace previousBook {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_B;
-      }
-
-
-      namespace chapterList {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace nextChapter {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = Qt::CTRL + Qt::Key_H;
-      }
-      namespace previousChapter {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_H;
-      }
-
-      namespace verseList {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace nextVerse {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_V;
-      }
-      namespace previousVerse {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = Qt::CTRL + Qt::SHIFT + Qt::Key_V;
-      }
-
-      namespace copyMenu {
-        const QString icon = "editcopy";//CResMgr::displaywindows::lexiconWindow::copyMenu::icon;
-      };
-      namespace saveMenu {
-        const QString icon = "filesave";//CResMgr::displaywindows::lexiconWindow::saveMenu::icon;
-      }
-      namespace printMenu {
-        const QString icon = "fileprint";//CResMgr::displaywindows::lexiconWindow::printMenu::icon;
-      }
-    };
-    namespace commentaryWindow {
-      namespace syncWindow {
-         QString tooltip;
-         QString whatsthis;
-         const QString icon 		= "bt_sync";
-         const KShortcut accel 	= KKeySequence(); //CResMgr::displaywindows::biblewindow::nextBook::accel;
-				 const char* actionName	= "commentary_syncWindow";
-       }
-
-    };
-    namespace lexiconWindow {
-      namespace entryList {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace nextEntry {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = KKeySequence();
-      }
-      namespace previousEntry {
-        QString tooltip;
-        QString whatsthis;
-        const KShortcut accel = KKeySequence();
-      }
-
-      namespace copyMenu {
-        const QString icon = "editcopy";
-      };
-      namespace saveMenu {
-        const QString icon = "filesave";
-      }
-      namespace printMenu {
-        const QString icon = "fileprint";
-      }
-    };
-    namespace bookWindow {
-      namespace toggleTree {
-        const QString icon = "view_sidetree";
-        const KShortcut accel = KKeySequence();
-      };
-    };
-
-    namespace writeWindow {
-      namespace saveText {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "filesave";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_saveText";
-      };
-      namespace restoreText {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "undo";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_restoreText";
-      };
-      namespace deleteEntry {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "editdelete";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_deleteEntry";
-      };
-
-      //formatting buttons
-      namespace boldText {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "text_bold";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_boldText";
-      };
-      namespace italicText {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "text_italic";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_italicText";
-      };
-      namespace underlinedText {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "text_under";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_underlineText";
-      };
-
-      namespace alignLeft {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "text_left";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_alignLeft";
-      };
-      namespace alignCenter {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "text_center";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_alignCenter";
-      };
-      namespace alignRight {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "rightjust";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName 	= "writeWindow_alignRight";
-      };
-      namespace alignJustify {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon      = "text_block";
-        const KShortcut accel   = KKeySequence();
-				const char* actionName	= "writeWindow_alignJustify";
-      };
-
-      namespace fontFamily {
-        QString tooltip;
-        QString whatsthis;
-	      const KShortcut accel   = KKeySequence();
-				const char* actionName	= "writeWindow_fontFamily";
-      };
-      namespace fontSize {
-        QString tooltip;
-        QString whatsthis;
-	      const KShortcut accel   = KKeySequence();
-				const char* actionName	= "writeWindow_fontSize";
-      };
-      namespace fontColor {
-        QString tooltip;
-        QString whatsthis;
-      };
-
-    };
-  };
-
-  namespace printing {
-    namespace itemPage {
-      namespace styleChooser {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace itemList {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace itemUp {
-        const QString icon = "up";
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace itemDown {
-        const QString icon = "down";
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace itemDelete {
-        const QString icon = "edittrash";
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-
-    namespace styleList {
-      namespace newStyle {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon = "filenew";
-      };
-      namespace deleteStyle {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon = "editdelete";
-      };
-      namespace editStyle {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon = "pencil";
-      };
-    };
-    namespace printerSettings {
-      namespace margins {
-        QString whatsthis;
-
-        namespace upper {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace lower {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace left {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace right {
-          QString tooltip;
-          QString whatsthis;
-        };
-      };
-    };
-  };
-  namespace settings {
-    namespace startup {
-      const QString icon = "bt_startconfig";
-      namespace dailyTip {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace showLogo {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace restoreWorkingArea {
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-    namespace fonts {
-      const QString icon = "fonts";
-
-      namespace typeChooser {
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-    namespace colors {
-      const QString icon = "colorize";
-
-      namespace text {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace background {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace links {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace footnotes {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace strongNumbers {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace highlightedVerse {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace jesusWords {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace morphTags {
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-    namespace profiles {
-      const QString icon = "view_sidetree";
-
-      namespace list {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace createNew {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace deleteCurrent {
-        QString tooltip;
-        QString whatsthis;
-      };
-      namespace renameCurrent {
-        QString tooltip;
-        QString whatsthis;
-      };
-    };
-    namespace sword {
-      const QString icon = "bt_swordconfig";
-
-      namespace general {
-        namespace cacheKeys {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace scrolling {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace language {
-          QString tooltip;
-          QString whatsthis;
-        };
-      };
-      namespace modules {
-        namespace bible {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace commentary {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace lexicon {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace dailyDevotional {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace hebrewStrongs {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace greekStrongs {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace hebrewMorph {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace greekMorph {
-          QString tooltip;
-          QString whatsthis;
-        };
-      };
-      namespace filters {
-        namespace lineBreaks {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace verseNumbers {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace footnotes {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace strongsNumbers {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace morphTags {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace headings {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace lemmas {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace hebrewVowelPoints {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace hebrewCantillation {
-           QString tooltip;
-          QString whatsthis;
-        };
-        namespace greekAccents {
-          QString tooltip;
-          QString whatsthis;
-        };
-        namespace textualVariants {
-          QString tooltip;
-          QString whatsthis;
-        };
-      };
-    };
-    namespace keys {
-      const QString icon = "key_bindings";
-    };
-  };
-
-    namespace mainIndex { //Main menu->Settings
-      namespace search {
-        QString tooltip;
-        QString whatsthis;
-        const QString icon        = "find";
-        const KShortcut accel     = Qt::CTRL + Qt::ALT + Qt::Key_M;
-        const char* actionName    = "GMsearch_action";
-      }
-      namespace newFolder {
-        const QString icon = "folder_new";
-      }
-      namespace changeFolder {
-        const QString icon = "folder";
-      }
-      namespace openedFolder {
-        const QString icon = "folder_open";
-      }
-      namespace closedFolder {
-        const QString icon = "folder";
-      }
-
-      namespace bookmark {
-        const QString icon = "bookmark";
-      }
-      namespace changeBookmark {
-        const QString icon = "bookmark";
-      }
-      namespace importBookmarks {
-        const QString icon = "bookmark";
-      }
-      namespace exportBookmarks {
-        const QString icon = "bookmark";
-      }
-      namespace printBookmarks {
-        const QString icon = "fileprint";
-      }
-      namespace deleteItems {
-        const QString icon = "filedelete";
-      }
-
-      namespace editModuleMenu {
-        const QString icon = "pencil";
-      }
-      namespace editModulePlain {
-        const QString icon = "pencil";
-      }
-      namespace editModuleHTML {
-        const QString icon = "pencil";
-      }
-
-      namespace unlockModule {
-        const QString icon = "unlock";
-      }
-      namespace aboutModule {
-        const QString icon = "info";
-      }
-    };
-  
-  namespace helpDialog {
-    const QString moduleLocked = "bibletime/helpdialog/help-module-encrypted.html";
-    const QString firstStart = "bibletime/helpdialog/help-first-startup.html";
-    const QString noSwordModules = "bibletime/helpdialog/help-no-modules.html";
-    const QString noSwordModuleConfigDir = "bibletime/helpdialog/help-no-mods-d.html";
-    const QString initBackendFailed = "bibletime/helpdialog/help-initbackend-failed.html";
-    const QString firstTimeSearchDialog = "bibletime/helpdialog/help-first-time-search.html";
-  };
-  
-};
-
-
-
-namespace CResMgr {
-  void init_i18n() {
-    using namespace CResMgr;
-    {
-      using namespace mainMenu;
-      {
-        using namespace file;
-        {
-          using namespace clearQueue;
-          tooltip    = makeToolTip( i18n("Clear print queue") );
-          whatsthis  = makeWhatsThis( tooltip, i18n("Clear the print queue of BibleTime.") );
-        };
-        {
-          using namespace print;
-          tooltip     = makeToolTip( i18n("Open the printer dialog") );
-          whatsthis   = makeWhatsThis( tooltip, i18n("Open the printer dialog of BibleTime, where you can edit the print queue, assign styles to the items and print them.") );
-        };
-        {
-          using namespace quit;
-          tooltip     = makeToolTip( i18n("Close BibleTime") );
-          whatsthis   = makeWhatsThis( tooltip, i18n("Close BibleTime and save the settings.") );
-        };
-
-        {
-          using namespace view;
-          {
-            using namespace showMainIndex;
-            tooltip     = makeToolTip(i18n("Show main index"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Toggle the main index view."));
-          }
-          {
-            using namespace showToolBar;
-            tooltip     = makeToolTip(i18n("Show main toolbar"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Toggle the main toolbar view."));
-          }
-        }
-
-        {
-          using namespace mainMenu::mainIndex;
-          {
-            using namespace search;
-            tooltip     = makeToolTip(i18n("Search in open modules"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Open the search dialog to search in all modules that are currently open."));
-          }
-          {
-            using namespace searchdefaultbible;
-            tooltip     = makeToolTip(i18n("Search default bible"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Open the search dialog to search in the default bible."));
-          }
-        };
-
-        {
-          using namespace window;
-          {
-            using namespace loadProfile;
-            tooltip     = makeToolTip( i18n("Load a session") );
-            whatsthis   = makeWhatsThis(tooltip,i18n("Restore a saved BibleTime session.") );
-          }
-          {
-            using namespace saveProfile;
-            tooltip     = makeToolTip(i18n("Save current session"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Save current BibleTime session so that it can be reused later."));
-          }
-          {
-            using namespace saveToNewProfile;
-            tooltip     = makeToolTip(i18n("Save as new session"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Create and save a new session."));
-          }
-          {
-            using namespace setupProfiles;
-            tooltip     = makeToolTip(i18n("Edit sessions"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Create new, delete or rename existing sessions."));
-          }
-          {
-            using namespace showFullscreen;
-            tooltip     = makeToolTip(i18n("Toggle fullscreen mode"));
-            whatsthis   = makeWhatsThis(tooltip,i18n("Toggle fullscreen mode of the main window."));
-          }
-          {
-            using namespace tile;
-            tooltip     = makeToolTip(i18n("Tile windows"));
-            whatsthis   = makeWhatsThis(tooltip,i18n("Tile the open display windows."));
-          }
-          {
-            using namespace cascade;
-            tooltip     = makeToolTip(i18n("Cascade windows"));
-            whatsthis   = makeWhatsThis(tooltip,i18n("Cascade the open display windows."));
-          }
-          {
-            using namespace autoTile;
-            tooltip     = makeToolTip(i18n("Automatically tile windows"));
-            whatsthis   = makeWhatsThis(tooltip,i18n("Automatically tile the open display windows."));
-          }
-          {
-            using namespace autoCascade;
-            tooltip     = makeToolTip(i18n("Automatically cascade windows"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Automatically cascade the open display windows."));
-          }
-          {
-            using namespace closeAll;
-            tooltip     = makeToolTip(i18n("Close all windows"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Close all open display windows."));
-          }
-        }
-
-        {
-          using namespace mainMenu::settings;
-          {
-            using namespace editToolBar;
-            tooltip     = makeToolTip(i18n("Edit toolbar"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Open BibleTime's toolbar editor."));
-          }
-          {
-            using namespace optionsDialog;
-            tooltip     = makeToolTip(i18n("Configure BibleTime"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Open the dialog to set most of BibleTime's preferences."));
-          };
-          {
-            using namespace swordSetupDialog;
-            tooltip     = makeToolTip(i18n("Configure Sword"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Open the dialog to configure Sword and install/update/remove Sword modules."));
-          };
-
-        };
-
-        {
-          using namespace help;
-          {
-            using namespace handbook;
-            tooltip     = makeToolTip(i18n("BibleTime's handbook"));
-            whatsthis   = makeWhatsThis(tooltip,i18n("Open BibleTime's handbook in the KDE helpbrowser.<BR>The handbook explains how to use BibleTime in the best way."));
-          };
-          {
-            using namespace bibleStudyHowTo;
-            tooltip     = makeToolTip(i18n("BibleTime's Bible study HowTo"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Open the Bible study HowTo included with BibleTime in the KDE helpbrowser.<BR>This HowTo is an introduction on how to study the Bible in an efficient way."));
-          };
-          {
-            using namespace whatsThis;
-            tooltip     = makeToolTip(i18n("Enter \"What's this?\" mode"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Switch into the <B>\"What's this?\"</B> mode.<BR>All important elements of BibleTime's GUI offer a \"What's this?\" help message."));
-          };
-          {
-            using namespace bugreport;
-            tooltip     = makeToolTip(i18n("Send bugreport"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Send a bugreport to the developers of BibleTime."));
-          };
-          {
-            using namespace dailyTip;
-            tooltip     = makeToolTip(i18n("Show daily tips at startup"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Show a daily tip each time BibleTime starts.<BR>The tips contain important Bible quotations and helpful tips for using BibleTime."));
-          };
-          {
-            using namespace aboutBibleTime;
-            tooltip     = makeToolTip(i18n("About BibleTime"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Show detailed information about BibleTime."));
-          };
-          {
-            using namespace aboutKDE;
-            tooltip     = makeToolTip(i18n("About KDE"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Show detailed information about the KDE project."));
-          };
-        };
-      };
-    };
-
-    {
-      using namespace searchdialog;
-      {
-        using namespace searchButton;
-        tooltip     = makeToolTip(i18n("Start the search"));
-        whatsthis   = makeWhatsThis(tooltip, i18n("Start to search the text in each of the chosen modules."));
-      };
-      {
-        using namespace cancelSearchButton;
-        tooltip     = makeToolTip(i18n("Stop search"));
-        whatsthis   = makeWhatsThis(tooltip, i18n("Stop the active search."));
-      };
-
-      {
-        using namespace options;
-        {
-          using namespace moduleChooserButton;
-          tooltip     = makeToolTip(i18n("Choose modules"));
-          whatsthis   = makeWhatsThis(tooltip, i18n("Open a dialog to choose modules for the search."));
-        };
-        {
-          using namespace searchedText;
-          tooltip     = makeToolTip(i18n("Search text"));
-          whatsthis   = makeWhatsThis(tooltip, i18n("Enter the text you want to search in the chosen modules here."));
-        };
-        {
-          using namespace searchType;
-          {
-            using namespace multipleWords_and;
-            tooltip     = makeToolTip(i18n("Multiple words (AND)"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Treat the search text as multiple words. A text must contain all of the words to match. The order of the words is unimportant."));
-          };
-          {
-            using namespace multipleWords_or;
-            tooltip     = makeToolTip(i18n("Multiple words (OR)"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Treat the search text as multiple words. A text must contain one or more words of to match. The order is unimportant."));
-          };
-          {
-            using namespace exactMatch;
-            tooltip     = makeToolTip(i18n("Exact match"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("The search text will be used exactly as entered."));
-          };
-          {
-            using namespace regExp;
-            tooltip     = makeToolTip(i18n("Regular expression"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Treat the search string as a GNU regular expression. The BibleTime handbook contains an introduction to regular expressions."));
-          };
-        };
-
-        {
-          using namespace searchOptions;
-          {
-            using namespace caseSensitive;
-            tooltip     = makeToolTip(i18n("Case sensitive matching"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("If you choose this option the search will distinguish between upper and lowercase characters."));
-          };
-        };
-        {
-          using namespace chooseScope;
-          tooltip     = makeToolTip(i18n("Choose a search scope"));
-          whatsthis   = makeWhatsThis(tooltip, i18n("Choose a scope from the list. Select the first item to use no scope, the second one is to use each module's last search result as search scope. The others are user defined search scopes."));
-        };
-        {
-          using namespace scopeEditor;
-          {
-            using namespace rangeList;
-            tooltip     = makeToolTip(i18n("Available search scopes"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Select an item from the list to edit the search scope."));
-          };
-          {
-            using namespace nameEdit;
-            tooltip     = makeToolTip(i18n("Search scope name"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Change the name of the selected search scope."));
-          };
-          {
-            using namespace editRange;
-            tooltip     = makeToolTip(i18n("Edit search scope ranges"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Change the search ranges of the selected search scope item. Have a look at the predefined search scopes to see how search ranges are constructed."));
-          };
-          {
-            using namespace parsedResult;
-            tooltip     = makeToolTip(i18n("Parsed search ranges"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Contains the search ranges which will be used for the search."));
-          };
-          {
-            using namespace addNewRange;
-            tooltip     = makeToolTip(i18n("Add a new search scope"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Add a new search scope. First enter an appropriate name, then edit the search ranges."));
-          };
-          {
-            using namespace deleteCurrentRange;
-            tooltip     = makeToolTip(i18n("Delete current search scope"));
-            whatsthis   = makeWhatsThis(tooltip, i18n("Deletes the selected search scope. If you close the dialog using Cancel the settings won't be saved."));
-          };
-        };
-      }
-      {
-        using namespace result;
-        {
-          using namespace moduleList;
-          tooltip     = makeToolTip(i18n("Used modules"));
-          whatsthis   = makeWhatsThis(tooltip, i18n("The list of modules chosen for the search."));
-        };
-        {
-          using namespace foundItems;
-          tooltip     = makeToolTip(i18n("Found items of selected module"));
-          whatsthis   = makeWhatsThis(tooltip, i18n("This list contains the search result of the selected module."));
-        };
-        {
-          using namespace textPreview;
-          tooltip     = makeToolTip(i18n("Text preview"));
-          whatsthis   = makeWhatsThis(tooltip, i18n("The text preview of the selected search result item."));
-        };
-      };
-    };
-
-    {
-      using namespace displaywindows;
-      {
-        using namespace general;
-        {
-          using namespace scrollButton;
-          tooltip = makeToolTip( i18n("Scroll through the list") );
-          whatsthis = makeWhatsThis(tooltip, i18n("This button is useful to scroll through the entries of the list. Press the button and move the mouse to increase or decrease the item."));
-        };
-        using namespace bibleWindow;
-        {
-          using namespace bookList;
-          tooltip = makeToolTip( i18n("List of books") );
-          whatsthis = makeWhatsThis(tooltip, i18n("This list contains the books which are available in this module."));
-        };
-        {
-          using namespace nextBook;
-          tooltip = makeToolTip( i18n("Show the next book") );
-          whatsthis = makeWhatsThis(tooltip, i18n("Show the next book of this module."));
-         }
-        {
-          using namespace previousBook;
-          tooltip = makeToolTip( i18n("Show the previous book") );
-          whatsthis = makeWhatsThis(tooltip, i18n("Show the previous book of this module."));
-        }
-        {
-          using namespace chapterList;
-          tooltip = makeToolTip( i18n("List of chapters") );
-          whatsthis = makeWhatsThis(tooltip, i18n("This list contains the chapters which are available in the current book."));
-        };
-        {
-          using namespace nextChapter;
-          tooltip = makeToolTip( i18n("Show the next chapter") );
-          whatsthis = makeWhatsThis(tooltip, i18n("Show the previous chapter of the module."));
-        }
-        {
-         using namespace previousChapter;
-          tooltip = makeToolTip( i18n("Show the previous chapter") );
-          whatsthis = makeWhatsThis(tooltip, i18n("Show the next chapter of the module."));
-        }
-        {
-         using namespace verseList;
-          tooltip = makeToolTip( i18n("List of verses") );
-          whatsthis = makeWhatsThis(tooltip, i18n("This list contains the verses which are available in the current chapter."));
-        };
-        {
-         using namespace nextVerse;
-         tooltip = makeToolTip( i18n("Jump to the next verse") );
-         whatsthis = makeWhatsThis(tooltip, i18n("In  Bible texts, the next verse will be highlighted. In commentaries, the next entry will be shown."));
-
-        }
-        { using namespace previousVerse;
-          tooltip = makeToolTip( i18n("Jump to the previous verse") );
-          whatsthis = makeWhatsThis(tooltip, i18n("In Bible texts, the previous verse will be highlighted. In commentaries, the previous entry will be shown."));
-        }
-      };
-      {
-        using namespace commentaryWindow;
-        {
-          using namespace syncWindow;
-           tooltip = makeToolTip(i18n("Synchronize with Bible windows"));
-           whatsthis = makeWhatsThis(tooltip, i18n("Synchronize the displayed entry of this module with the active Bible window."));
-         }
-      };
-      {
-        using namespace lexiconWindow;
-        {
-          using namespace entryList;
-          tooltip = makeToolTip( i18n("List of entries") );
-          whatsthis = makeWhatsThis(tooltip, i18n("This list contains the entries of the current module."));
-        };
-        {
-          using namespace nextEntry;
-          tooltip = makeToolTip( i18n("Show the next entry") );
-          whatsthis = makeWhatsThis(tooltip, i18n("The next entry of the module will be shown."));
-        };
-        {
-          using namespace previousEntry;
-          tooltip = makeToolTip( i18n("Show the previous entry") );
-          whatsthis = makeWhatsThis(tooltip, i18n("The previous entry of the module will be shown."));
-        };
-      };
-
-    {
-      using namespace writeWindow;
-      {
-        using namespace saveText;
-        tooltip   = makeToolTip( i18n("Save the current text") );
-        whatsthis = makeWhatsThis( tooltip, i18n("Save the curent text into the module. The old text will be overwritten.") );
-      };
-      {
-        using namespace restoreText;
-        tooltip   = makeToolTip( i18n("Restore the old text") );
-        whatsthis = makeWhatsThis( tooltip, i18n("Loads the old text from the module and loads it into the edit area. The unsaved text will be lost.") );
-      };
-      {
-        using namespace deleteEntry;
-        tooltip   = makeToolTip( i18n("Delete the current entry") );
-        whatsthis = makeWhatsThis( tooltip, i18n("Deletes the current entry out of the module. The text will be lost.") );
-      };
-
-      //formatting buttons
-      {
-        using namespace boldText;
-        tooltip   = makeToolTip( i18n("Bold text") );
-        whatsthis = makeWhatsThis( tooltip, i18n("Toggle bold formatting of the selected text.") );
-      };
-      {
-        using namespace italicText;
-        tooltip   = makeToolTip( i18n("Italic text") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Toggle italic formatting of the selected text.") );
-        };
-        {
-          using namespace underlinedText;
-          tooltip   = makeToolTip( i18n("Underline text") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Toggle underlined formatting of the selected text.") );
-        };
-
-        {
-          using namespace alignLeft;
-          tooltip   = makeToolTip( i18n("Align left") );
-          whatsthis = makeWhatsThis( tooltip, i18n("The text will be aligned on the left side of the page.") );
-        };
-        {
-          using namespace alignCenter;
-          tooltip   = makeToolTip( i18n("Center") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Centers the text horizontally.") );
-        };
-        {
-          using namespace alignRight;
-          tooltip   = makeToolTip( i18n("Align right") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Aligns the text on the right side of the page.") );
-        };
-        {
-          using namespace alignJustify;
-          tooltip   = makeToolTip( i18n("Justify") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Justifies the text on the page.") );
-        };
-
-        {
-          using namespace fontFamily;
-          tooltip   = makeToolTip( i18n("Set the font") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Choose a new font for the selected text.") );
-        };
-        { using namespace fontSize;
-          tooltip   = makeToolTip( i18n("Set the font size") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Choose a new font size for the selected text.") );
-        };
-        { using namespace fontColor;
-          tooltip   = makeToolTip( i18n("Set the color") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Choose a new color for the selected text.") );
-        };
-      };
-    };
-
-    {
-      using namespace printing;
-      {
-        using namespace itemPage;
-        {
-          using namespace styleChooser;
-          tooltip = makeToolTip(i18n("Styles"));
-          whatsthis = makeWhatsThis(tooltip,i18n("This list contains the available print styles."));
-        };
-        {
-          using namespace itemList;
-          tooltip = makeToolTip(i18n("List of print items"));
-          whatsthis = makeWhatsThis(tooltip,i18n("This is the list which contains the items to be printed."));
-        };
-        {
-          using namespace itemUp;
-          tooltip = makeToolTip(i18n("Move item up"));
-          whatsthis = makeWhatsThis(tooltip,i18n("Move the selected item up one line."));
-        };
-        {
-          using namespace itemDown;
-          tooltip = makeToolTip(i18n("Move item down"));
-          whatsthis = makeWhatsThis(tooltip,i18n("Move the selected item down one line."));
-        };
-        {
-          using namespace itemDelete;
-          tooltip = makeToolTip(i18n("Delete items"));
-          whatsthis = makeWhatsThis(tooltip,i18n("Delete the selected items."));
-        };
-      };
-
-      {
-        using namespace styleList;
-        {
-          using namespace newStyle;
-          tooltip = makeToolTip( i18n("New printing style") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Create a new printing style.") );
-
-        };
-        {
-          using namespace deleteStyle;
-          tooltip = makeToolTip( i18n("Delete printing style") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Remove the selected printing style from the list.") );
-
-        };
-        {
-          using namespace editStyle;
-          tooltip = makeToolTip( i18n("Edit printing style") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Change the properties of the selected printing style.") );
-
-        };
-      };
-      {
-        using namespace printerSettings;
-        {
-          margins::whatsthis = makeWhatsThis( makeToolTip(i18n("Size of page borders")), i18n("This group contains the page borders of the page measured in millimeters.") );
-          {
-            using namespace margins::upper;
-            tooltip = makeToolTip( i18n("Upper border") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The size of the border on the top of the paper.") );
-          };
-          {
-            using namespace margins::lower;
-            tooltip = makeToolTip( i18n("Lower border") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The size of the border on the bottom of the paper.") );
-          };
-          {
-            using namespace margins::left;
-            tooltip = makeToolTip( i18n("Left border") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The size of the border on the left side of the paper.") );
-          };
-          {
-            using namespace margins::right;
-            tooltip = makeToolTip( i18n("Right border") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The size of the border on the right side of the paper.") );
-          };
-        };
-      };
-    };
-    {
-      using namespace settings;
-      {
-        using namespace startup;
-        {
-          using namespace dailyTip;
-          tooltip   = makeToolTip( i18n("Show daily tip") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Activate this box to see a daily tip on startup."));
-        };
-        {
-          using namespace showLogo;
-          tooltip   = makeToolTip( i18n("Show startup logo") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Activate this to see the BibleTime logo on startup."));
-        };
-        {
-          using namespace restoreWorkingArea;
-          tooltip   = makeToolTip( i18n("Restore the last BibleTime session on startup") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Save the user's session when BibleTime is closed and restore it on the next startup."));
-        };
-      };
-      {
-        using namespace fonts;
-        {
-          using namespace typeChooser;
-          tooltip   = makeToolTip( i18n("Choose a language") );
-          whatsthis = makeWhatsThis( tooltip, i18n("The font selection below will apply to all texts in this language."));
-        };
-      };
-      {
-        using namespace colors;
-        {
-          using namespace text;
-          tooltip = makeToolTip( i18n("Text color") );
-          whatsthis = makeWhatsThis( tooltip, i18n("The color used for normal text in the display windows."));
-        };
-        {
-          using namespace background;
-          tooltip = makeToolTip( i18n("Color of the background") );
-          whatsthis = makeWhatsThis( tooltip, i18n("This is the background color used in display windows."));
-        };
-        {
-          using namespace links;
-          tooltip   = makeToolTip( i18n("Link color") );
-          whatsthis = makeWhatsThis( tooltip, i18n("The color used for all references into Sword modules."));
-        };
-        {
-          using namespace footnotes;
-          tooltip   = makeToolTip( i18n("Footnote color") );
-          whatsthis = makeWhatsThis( tooltip, i18n("This color will be used for all footnotes in the display windows."));
-        };
-        {
-          using namespace strongNumbers;
-          tooltip   = makeToolTip( i18n("Strong's Numbers") );
-          whatsthis = makeWhatsThis( tooltip, i18n("This color will be used for every Strong's Number in the display windows."));
-        };
-        {
-          using namespace highlightedVerse;
-          tooltip   = makeToolTip( i18n("Color of the highlighted verse") );
-          whatsthis = makeWhatsThis( tooltip, i18n("This is the color of the highlighted verse used in display windows."));
-        };
-        {
-          using namespace jesusWords;
-          tooltip   = makeToolTip( i18n("Words of Jesus") );
-          whatsthis = makeWhatsThis( tooltip, i18n("All words spoken by Jesus will appear in this color."));
-        };
-        {
-          using namespace morphTags;
-          tooltip = makeToolTip( i18n("Morphological tags") );
-          whatsthis = makeWhatsThis( tooltip, i18n("All morphological tags will appear in this color."));
-        };
-      };
-      {
-        using namespace profiles;
-        {
-          using namespace list;
-          tooltip   = makeToolTip( i18n("List of sessions") );
-          whatsthis = makeWhatsThis( tooltip, i18n("The list of available sessions."));
-        };
-        {
-          using namespace createNew;
-          tooltip   = makeToolTip( i18n("Create new session") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Create a new, empty session with default settings."));
-        };
-        {
-          using namespace deleteCurrent;
-          tooltip   = makeToolTip( i18n("Delete session") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Delete the selected session."));
-        };
-        {
-          using namespace renameCurrent;
-          tooltip   = makeToolTip( i18n("Rename session") );
-          whatsthis = makeWhatsThis( tooltip, i18n("Rename the selected session."));
-        };
-      };
-      {
-        using namespace settings::sword;
-        {
-          using namespace general;
-          {
-            using namespace cacheKeys;
-            tooltip   = makeToolTip( i18n("Use cache files for the lexicon entries") );
-            whatsthis = makeWhatsThis( tooltip, i18n("Activate this to let BibleTime create index files for the lexicon entries. This increases the speed of opening large lexicon modules significantly, but does consume some disk space. Recommended."));
-          };
-          {
-            using namespace scrolling;
-            tooltip   = makeToolTip( i18n("Use down arrow to scroll to next verse") );
-            whatsthis = makeWhatsThis( tooltip, i18n("Check this to use the down arrow to scroll to the next verse."));
-          };
-          {
-            using namespace language;
-            tooltip   = makeToolTip( i18n("List of languages") );
-            whatsthis = makeWhatsThis( tooltip, i18n("Contains the languages which can be used for the biblical booknames."));
-          };
-        };
-        {
-          using namespace settings::sword::modules;
-          {
-            using namespace bible;
-            tooltip   = makeToolTip( i18n("The default bible used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The default Bible is used when a hyperlink into a Bible is clicked."));
-          };
-          {
-            using namespace commentary;
-            tooltip   = makeToolTip( i18n("The default commentary used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The default commentary is used when a hyperlink into a commentary is clicked."));
-          };
-          {
-            using namespace lexicon;
-            tooltip   = makeToolTip( i18n("The default lexicon used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The default lexicon is used when a hyperlink into a lexicon is clicked."));
-          };
-          {
-            using namespace dailyDevotional;
-            tooltip   = makeToolTip( i18n("The default daily devotional module") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The default devotional will be used to display a short start up devotional."));
-          };
-          {
-            using namespace hebrewStrongs;
-            tooltip   = makeToolTip( i18n("The default Hebrew lexicon used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The default Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is clicked."));
-          };
-          {
-            using namespace greekStrongs;
-            tooltip   = makeToolTip( i18n("The default Greek lexicon used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The default Greek lexicon is used when a hyperlink into a Greek lexicon is clicked."));
-          };
-          {
-            using namespace hebrewMorph;
-            tooltip   = makeToolTip( i18n("The default Morphological lexicon for Hebrew texts used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The standard morphological lexicon for Hebrew texts is used when a hyperlink of a morphological tag in a Hebrew text is clicked."));
-          };
-          {
-            using namespace greekMorph;
-            tooltip   = makeToolTip( i18n("The default Morphological lexicon for Greek texts used in the workspace area") );
-            whatsthis = makeWhatsThis( tooltip, i18n("The standard morphological lexicon for Greek texts is used when a hyperlink of a morphological tag in a Greek text is clicked."));
-          };
-        };
-        {
-          using namespace filters;
-          {
-            using namespace lineBreaks;
-            tooltip   = makeToolTip( i18n("Line breaks") );
-            whatsthis = makeWhatsThis( tooltip, i18n("Insert line breaks after each verse."));
-          };
-          {
-            using namespace verseNumbers;
-            tooltip   = makeToolTip( i18n("Verse numbers") );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show the verse number before each verse in Bibles."));
-          };
-          {
-            using namespace footnotes;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::footnotes) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show footnotes embedded in the module's text."));
-          };
-          {
-            using namespace strongsNumbers;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::strongNumbers) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show Strong's Numbers embedded in the text of modules which support this feature."));
-          };
-          {
-            using namespace morphTags;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::morphTags) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show tags providing morphological information in the text of modules which support this feature."));
-          };
-          {
-            using namespace headings;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::headings) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show section headings in the text in the text of modules which support this feature."));
-          };
-          {
-            using namespace lemmas;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::lemmas) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show root words."));
-          };
-          {
-            using namespace hebrewVowelPoints;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::hebrewPoints) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show hebrew vowel points in the text."));
-          };
-          {
-            using namespace hebrewCantillation;
-            tooltip  = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::hebrewCantillation) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show hebrew cantillation marks in the text."));
-          };
-          {
-            using namespace greekAccents;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::greekAccents) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Show greek accents in the text."));
-          };
-          {
-            using namespace textualVariants;
-            tooltip   = makeToolTip( CSwordBackend::translatedOptionName(CSwordBackend::textualVariants) );
-            whatsthis = makeWhatsThis( tooltip, i18n("Use different variants from the textual sources."));
-          };
-        };
-      };
-    };
-    {
-      using namespace mainIndex;
-      {
-        using namespace search;
-        tooltip     = makeToolTip(i18n("Search in open modules"));
-        whatsthis   = makeWhatsThis(tooltip, i18n("Opens the search dialog to search in the modules that are currently open."));
-      };
-    };
-  };
-};
diff --git a/bibletime/util/cresmgr.h b/bibletime/util/cresmgr.h
deleted file mode 100644
index d09a429..0000000
--- a/bibletime/util/cresmgr.h
+++ /dev/null
@@ -1,890 +0,0 @@
-/***************************************************************************
-                          chelpmgr.h  -  description
-                             -------------------
-    begin                : Mon Sep 16 2002
-    copyright            : (C) 2002 by The BibleTime team
-    email                : info@bibletime.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CRESMGR_H
-#define CRESMGR_H
-
-//Qt includes
-#include <qstring.h>
-#include <qkeysequence.h>
-
-//KDE includes
-#include <kshortcut.h>
-
-/** Provides static functions to easily access the Tooltip and WhatsThis texts for all the frontend parts.
-  * @author The BibleTime team
-  */  
-namespace CResMgr {
-  void init_i18n();
-  
-  namespace modules {
-    namespace bible {
-      extern const QString icon_unlocked;
-      extern const QString icon_locked;
-      extern const QString icon_add;
-    };
-    namespace commentary {
-      extern const QString icon_unlocked;
-      extern const QString icon_locked;
-      extern const QString icon_add;
-    };
-    namespace lexicon {
-      extern const QString icon_unlocked;
-      extern const QString icon_locked;
-      extern const QString icon_add;
-    };
-    namespace book {
-      extern const QString icon_unlocked;
-      extern const QString icon_locked;
-      extern const QString icon_add;
-    };
-  };  
-  
-  namespace mainMenu { //Main menu
-    namespace file { //Main menu->File
-      namespace clearQueue {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace print { //a standard action
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-      namespace quit { //a standard action
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-    }
-
-    namespace view { //Main menu->View
-      namespace showMainIndex {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace showToolBar { //a standard action
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-    }
-
-    namespace mainIndex { //configuration for the main index and the view->search menu
-      namespace search {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace searchdefaultbible {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-    };
-
-    namespace window { //Main menu->Window
-      namespace loadProfile {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const char* actionName;
-      }
-      namespace saveProfile {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const char* actionName;
-      }
-      namespace saveToNewProfile {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace setupProfiles {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace showFullscreen {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace tile {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace cascade {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace autoTile {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace autoCascade {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-      namespace closeAll {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-    }
-
-    namespace settings { //Main menu->Settings
-      namespace editToolBar { // available as KStdAction
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-      namespace optionsDialog { // available as KStdAction
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace swordSetupDialog {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      }
-    };
-
-    namespace help { //Main menu->Help
-      namespace handbook {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      };
-      namespace bibleStudyHowTo {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      };
-      namespace whatsThis { // available as KStdAction
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace bugreport { // available as KStdAction
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace dailyTip {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-        extern const char* actionName;
-      };
-      namespace aboutBibleTime { // available as KStdAction
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace aboutKDE { // available as KStdAction
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-  }  //end of main menu
-
-  namespace searchdialog {
-    extern const QString icon;
-
-    namespace searchButton {
-      extern QString tooltip;
-      extern QString whatsthis;
-    };
-    namespace cancelSearchButton {
-      extern QString tooltip;
-      extern QString whatsthis;
-    };
-
-    namespace options {
-//      namespace moduleChooserDialog {
-//        extern QString tooltip;
-//        extern QString whatsthis;
-//      };
-      namespace moduleChooserButton {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace searchedText {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace searchType {
-        namespace multipleWords_and {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace multipleWords_or {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace exactMatch {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace regExp {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-      };
-
-      namespace searchOptions {
-        namespace caseSensitive {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-      };
-      namespace chooseScope {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace scopeEditor {
-        namespace rangeList {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace nameEdit {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace editRange {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace parsedResult {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace addNewRange {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace deleteCurrentRange {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-
-      };
-    }
-    namespace result {
-      namespace moduleList {
-        extern QString tooltip;
-        extern QString whatsthis;
-
-        namespace copyMenu {
-          extern const QString icon;
-        };
-        namespace saveMenu {
-          extern const QString icon;
-        };
-        namespace printMenu {
-          extern const QString icon;
-        };
-      };
-      namespace foundItems {
-        extern QString tooltip;
-        extern QString whatsthis;
-
-        namespace copyMenu {
-          extern const QString icon;
-        };
-        namespace saveMenu {
-          extern const QString icon;
-        };
-        namespace printMenu {
-          extern const QString icon;
-        };
-
-      };
-      namespace textPreview {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-  };
-
-  namespace workspace {
-  };
-
-  namespace displaywindows {
-    namespace transliteration {
-      extern const QString icon;
-    };
-    namespace displaySettings {
-      extern const QString icon;
-    };
-
-    namespace general {
-      namespace scrollButton{
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-
-    namespace bibleWindow {
-      namespace bookList {
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-      namespace nextBook {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-      namespace previousBook {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-
-      namespace chapterList {
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-      namespace nextChapter {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-      namespace previousChapter {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-
-      namespace verseList {
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-      namespace nextVerse {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-      namespace previousVerse {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-
-      namespace copyMenu {
-        extern const QString icon;
-      };
-      namespace saveMenu {
-        extern const QString icon;
-      }
-      namespace printMenu {
-        extern const QString icon;
-      }
-    };
-    namespace commentaryWindow {
-      namespace syncWindow {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      }
-
-    };
-
-    namespace lexiconWindow {
-      namespace entryList {
-        extern QString tooltip;
-        extern QString whatsthis;
-      }
-      namespace nextEntry {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-      namespace previousEntry {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const KShortcut accel;
-      }
-
-      namespace copyMenu {
-        extern const QString icon;
-      }
-      namespace saveMenu {
-        extern const QString icon;
-      }
-      namespace printMenu {
-        extern const QString icon;
-      }
-    };
-    namespace bookWindow {
-      namespace toggleTree {
-        extern const QString icon;
-        extern const KShortcut accel;
-      };
-    };
-
-
-    namespace writeWindow {
-      namespace saveText {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace restoreText {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace deleteEntry {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-
-    //formatting buttons
-      namespace boldText {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace italicText {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace underlinedText {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-
-      namespace alignLeft {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace alignCenter {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace alignRight {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace alignJustify {
-        extern QString tooltip;
-        extern QString whatsthis;
-        extern const QString icon;
-        extern const KShortcut accel;
-				extern const char* actionName;
-      };
-
-      namespace fontFamily {
-        extern QString tooltip;
-        extern QString whatsthis;
-	      extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace fontSize {
-        extern QString tooltip;
-        extern QString whatsthis;
-	      extern const KShortcut accel;
-				extern const char* actionName;
-      };
-      namespace fontColor {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-
-    };
-  };
-
-   namespace printing {
-    namespace itemPage {
-      namespace styleChooser {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace itemList {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace itemUp {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace itemDown {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace itemDelete {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-
-    namespace styleList {
-      namespace newStyle {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace deleteStyle {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace editStyle {
-        extern const QString icon;
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-    namespace printerSettings {
-      namespace margins {
-        extern QString whatsthis;
-
-        namespace upper {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace lower {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace left {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace right {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-      };
-    };
-  };
-
-  namespace settings {
-    namespace startup {
-      extern const QString icon;
-
-      namespace dailyTip {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace showLogo {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace restoreWorkingArea {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-    namespace fonts {
-      extern const QString icon;
-
-      namespace typeChooser {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-    namespace colors {
-      extern const QString icon;
-
-      namespace text {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace background {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace links {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace footnotes {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace strongNumbers {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace highlightedVerse {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace jesusWords {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace morphTags {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-    namespace profiles {
-      extern const QString icon;
-
-      namespace list {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace createNew {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace deleteCurrent {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-      namespace renameCurrent {
-        extern QString tooltip;
-        extern QString whatsthis;
-      };
-    };
-    namespace sword {
-      extern const QString icon;
-
-      namespace general {
-        namespace cacheKeys {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace scrolling {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace language {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-      };
-      namespace modules {
-        namespace bible {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace commentary {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace lexicon {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace dailyDevotional {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace hebrewStrongs {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace greekStrongs {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace hebrewMorph {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace greekMorph {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-      };
-      namespace filters {
-        namespace lineBreaks {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace verseNumbers {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace footnotes {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace strongsNumbers {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace morphTags {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace headings {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace lemmas {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace hebrewVowelPoints {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace hebrewCantillation {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace greekAccents {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-        namespace textualVariants {
-          extern QString tooltip;
-          extern QString whatsthis;
-        };
-      };
-    };
-    namespace keys {
-      extern const QString icon;
-    };
-  };
-
-  namespace mainIndex { //configuration for the main index and the view->search menu
-    namespace search {
-      extern QString tooltip;
-      extern QString whatsthis;
-      extern const QString icon;
-      extern const KShortcut accel;
-      extern const char* actionName;
-    }
-    namespace newFolder {
-      extern const QString icon;
-    }
-    namespace changeFolder {
-      extern const QString icon;
-    }
-    namespace openedFolder {
-      extern const QString icon;
-    }
-    namespace closedFolder {
-      extern const QString icon;
-    }    
-
-    namespace bookmark {
-      extern const QString icon;
-    }
-    namespace changeBookmark {
-      extern const QString icon;
-    }
-    namespace importBookmarks {
-      extern const QString icon;
-    }
-    namespace exportBookmarks {
-      extern const QString icon;
-    }
-    namespace printBookmarks {
-      extern const QString icon;
-    }
-    namespace deleteItems {
-      extern const QString icon;
-    }
-
-    namespace editModuleMenu {
-      extern const QString icon;
-    }
-    namespace editModulePlain {
-      extern const QString icon;
-    }
-    namespace editModuleHTML {
-      extern const QString icon;
-    }
-
-    namespace unlockModule {
-      extern const QString icon;
-    }
-    namespace aboutModule {
-      extern const QString icon;
-    }    
-  };
-  
-  namespace helpDialog {
-    extern const QString moduleLocked;
-    extern const QString firstStart;
-    extern const QString noSwordModules;    
-    extern const QString noSwordModuleConfigDir;
-    extern const QString initBackendFailed;
-    extern const QString firstTimeSearchDialog;
-  };
-}
-
-#endif
diff --git a/bibletime/util/ctoolclass.cpp b/bibletime/util/ctoolclass.cpp
deleted file mode 100644
index d2caf7a..0000000
--- a/bibletime/util/ctoolclass.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-/***************************************************************************
-                 ctoolclass.cpp - some methods,that would be normal global,but
-                 									I hate global function :-)
-
-    begin                : 20 Jan 1999                        
-    copyright            : (C) 1999 by Sandy Meier                         
-    email                : smeier@rz.uni-potsdam.de                         
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   * 
- *                                                                         *
- ***************************************************************************/
-
-//own includes
-#include "ctoolclass.h"
-
-#include "util/cresmgr.h"
-#include "backend/cswordmoduleinfo.h"
-
-//QT includes
-#include <qlabel.h>
-#include <qfile.h>
-#include <qfiledialog.h>
-#include <qtextstream.h>
-#include <qregexp.h>
-
-//KDE includes
-#include <klocale.h>
-#include <kglobal.h>
-#include <kiconloader.h>
-#include <kstandarddirs.h>
-#include <kmessagebox.h>
-#include <kurl.h>
-#include <kfiledialog.h>
-#include <kapplication.h>
-
-
-QString CToolClass::locatehtml(const QString &filename) {
-  QString path = locate("html", KGlobal::locale()->language() + '/' + filename);
-  if (path.isNull())
-		path = locate("html", "default/" + filename);
-  if (path.isNull())
-		path = locate("html", "en/" + filename);
-  return path;
-}
-
-/** Converts HTML text to plain text */
-QString CToolClass::htmlToText(const QString& html) {
-  QString newText = html;
-  // convert some tags we need in code
-	newText.replace( QRegExp(" "),"#SPACE#" );
-	newText.replace( QRegExp("<BR>\\s*"), "<BR>\n" );
- 	newText.replace( QRegExp("#SPACE#")," " );
-
-  QRegExp re("<.+>");
-  re.setMinimal(true);
-  newText.replace( re,"" );
-	return newText;	
-}
-
-/** Converts text to HTML (\n to <BR>) */
-QString CToolClass::textToHTML(const QString& text){
-	QString newText = text;
-	newText.replace( QRegExp("<BR>\n"),"#NEWLINE#" );
-	newText.replace( QRegExp("\n"),"<BR>\n" );
-	newText.replace( QRegExp("#NEWLINE#"),"<BR>\n");	
-	return newText;
-}
-
-/** Creates the file filename and put text into the file.
- */
-bool CToolClass::savePlainFile( const QString& filename, const QString& text, const bool& forceOverwrite, const QTextStream::Encoding& fileEncoding){
-	QFile saveFile(filename);
-	bool ret;
-
-	if (saveFile.exists()) {
-		if (!forceOverwrite && KMessageBox::warningYesNo(0,
-				  QString::fromLatin1("<qt><B>%1</B><BR>%2</qt>")
-					  .arg( i18n("The file already exists.") )
-					  .arg( i18n("Do you want to overwrite it?")
-          )
-        ) == KMessageBox::No
-		) {
-			return false;
-    }
-		else { //either the user chose yes or forceOverwrite is set
-			saveFile.remove();
-    }
-	};
-
-	if ( saveFile.open(IO_ReadWrite) ) {
-		QTextStream textstream( &saveFile );
-		textstream.setEncoding(fileEncoding);
-		textstream << text;
-		saveFile.close();
-		ret = true;
-	}
-	else {
-		KMessageBox::error(0, QString::fromLatin1("<qt>%1<BR><B>%2</B></qt>")
-			.arg( i18n("The file couldn't be saved.") )
-			.arg( i18n("Please check permissions etc.")));
-		saveFile.close();
-		ret = false;
-	}
-	return ret;
-}
-
-
-/** Returns the icon used for the module given as aparameter. */
-QPixmap CToolClass::getIconForModule( CSwordModuleInfo* module_info ){
-  if (!module_info)
-  	return SmallIcon(CResMgr::modules::book::icon_locked, 16);
-
-  if (module_info->category() == CSwordModuleInfo::Cult) {
-    return SmallIcon("stop.png", 16);
-  };
-   
-   
-  QPixmap img;
-  
- 	switch (module_info->type()){
- 	  case CSwordModuleInfo::Bible:
- 	    if (module_info->isLocked())
- 	      img = SmallIcon(CResMgr::modules::bible::icon_locked, 16);
- 	    else
- 	      img = SmallIcon(CResMgr::modules::bible::icon_unlocked, 16);
-      break;
-  
- 	  case CSwordModuleInfo::Lexicon:
- 	    if (module_info->isLocked())
- 	      img = SmallIcon(CResMgr::modules::lexicon::icon_locked, 16);
- 	    else
- 	      img = SmallIcon(CResMgr::modules::lexicon::icon_unlocked, 16);
-      break;
- 	
- 	  case CSwordModuleInfo::Commentary:
- 	    if (module_info->isLocked())
- 	      img = SmallIcon(CResMgr::modules::commentary::icon_locked, 16);
- 	    else
- 	      img = SmallIcon(CResMgr::modules::commentary::icon_unlocked, 16);
-      break;
- 	
- 	  case CSwordModuleInfo::GenericBook:
- 	    if (module_info->isLocked())
- 	      img = SmallIcon(CResMgr::modules::book::icon_locked, 16);
- 	    else
- 	      img = SmallIcon(CResMgr::modules::book::icon_unlocked, 16);
-      break;
- 	
- 	  case CSwordModuleInfo::Unknown: //fall though to default
- 	  default:
- 	    if (module_info->isLocked())
- 	      img = SmallIcon(CResMgr::modules::book::icon_locked, 16);
- 	    else
- 	      img = SmallIcon(CResMgr::modules::book::icon_unlocked, 16);
-      break;
- 	}
-
-  
-  return img;
-}
-
-QLabel* CToolClass::explanationLabel(QWidget* parent, const QString& heading, const QString& text ){
-  QLabel* label = new QLabel( QString::fromLatin1("<B>%1</B><BR>%2").arg(heading).arg(text),parent );
-  label->setAutoResize(true);
-  label->setMargin(1);
-  label->setFrameStyle(QFrame::Box | QFrame::Plain);
-  return label;
-}
-
-/** No descriptions */
-bool CToolClass::inHTMLTag(int pos, QString & text){
- int i1=text.findRev("<",pos);
- int i2=text.findRev(">",pos);
- int i3=text.find(">",pos);
- int i4=text.find("<",pos);
-
-
-//	if ((i1>0) && (i2==-1))  //we're in th first html tag
-//		i2=i1; // not ncessary, just for explanation
-
-	if ((i3>0) && (i4==-1))  //we're in the last html tag
-	  i4=i3+1;
-
-//  qWarning("%d > %d && %d < %d",i1,i2,i3,i4);
-
- if ( (i1>i2) && (i3<i4) )
-    return true; //yes, we're in a tag
-
-  return false;
-}
diff --git a/bibletime/util/ctoolclass.h b/bibletime/util/ctoolclass.h
deleted file mode 100644
index f7c7453..0000000
--- a/bibletime/util/ctoolclass.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/***************************************************************************
-                 ctoolclass.h - some methods,that would be normal global, but
-                  I hate global function :-)
-                             -------------------                                         
-
-    begin                : 20 Jan 1999
-    copyright            : (C) 1999 by Joachim Ansorg
-    email                : Jockel123@gmx.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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.                                   * 
- *                                                                         *
- ***************************************************************************/
-
-//BibleTime includes
-
-
-//Qt includes
-#include <qstring.h>
-#include <qpixmap.h>
-#include <qtextstream.h>
-
-
-#ifndef CTOOLCLASS_H
-#define CTOOLCLASS_H
-
-
-class CSwordModuleInfo;
-class QLabel;
-
-/**
- * Provides some useful functions which would be normally global.
- *
- * Some methods,that would be normaly global, but I hate global functions :-)
- * (the function locateHTML is from Sandy Meier (KDevelop))
- *
- * @short A class which contains static members to do small things.
- * @author Joachim Ansorg <jansorg@gmx.de>
- */
-class CToolClass {
-
-public:
- /**
-  * @return The path of the HTML file "filename". This function searches only in $KDEDIR.
-  * @author Sandy Meier of the KDevelop team.
-  */
-  static QString locatehtml(const QString &filename);
-	/**
-  * Converts HTML text to plain text.
- 	* This function converts some HTML tags in text (e.g. <BR> to \n)
- 	* @return The text withput HTML tags and with converted <BR> to \n
- 	* @author Joachim Ansorg 	
- 	*/
-  static QString htmlToText(const QString&);
-  /**
-  * Converts text to HTML converting some text commands into HTML tags (e.g. \n to <BR>)
-  * @return The HTML formatted text we got after changing \n to <BR>
-  * @author Joachim Ansorg
-  */
-  static QString textToHTML(const QString&);
-  /**
-  * Creates the file filename and put the text of parameter "text" into the file.
-  * @return True if saving was sucessful, otherwise false
-  * @author Joachim Ansorg
-  */
-  static bool savePlainFile( const QString& filename, const QString& text, const bool& forceOverwrite = false, const QTextStream::Encoding& fileEncoding = QTextStream::Locale);
-  /**
- 	* Returns the icon used for the module given as aparameter.
- 	*/
-  static QPixmap getIconForModule( CSwordModuleInfo* );
-  /** Returns a label to explain difficult things of dialogs.
-  * This function returns a label with heading "heading" and explanation "text". This label should be used to
-  * explain difficult things of the GUI, e.g. in the optionsdialog.
-  */
-  static QLabel* explanationLabel(QWidget* parent, const QString& heading, const QString& text );
-  /**
-  * Returns true if the character at position "pos" of text is inside an HTML tag. Returns false if it's not inside an HTML tag.
-  */
-  static bool inHTMLTag(int pos, QString & text);
-};
-
-#endif
diff --git a/bibletime/util/scoped_resource.h b/bibletime/util/scoped_resource.h
deleted file mode 100644
index 351667c..0000000
--- a/bibletime/util/scoped_resource.h
+++ /dev/null
@@ -1,160 +0,0 @@
-#ifndef SCOPED_RESOURCE_H_INCLUDED
-#define SCOPED_RESOURCE_H_INCLUDED
-
-/**
-* The util namespace should take all classes which are of a generic type,
-* used to perform common tasks which are not BibleTime-specific. See
-* @ref scoped_resource for an example.
-*/
-namespace util
-{
-/**
-* A class template, scoped_resource, designed to
-* implement the Resource Acquisition Is Initialization (RAII) approach
-* to resource management. scoped_resource is designed to be used when
-* a resource is initialized at the beginning or middle of a scope,
-* and released at the end of the scope. The template argument
-* ReleasePolicy is a functor which takes an argument of the
-* type of the resource, and releases it.
-*
-* Usage example, for working with files:
-*
-* @code
-* struct close_file { void operator(int fd) const {close(fd);} };
-* ...
-* {
-*    const scoped_resource<int,close_file> file(open("file.txt",O_RDONLY));
-*    read(file, buf, 1000);
-* } // file is automatically closed here
-* @endcode
-*
-* Note that scoped_resource has an explicit constructor, and prohibits
-* copy-construction, and thus the initialization syntax, rather than
-* the assignment syntax must be used when initializing.
-*
-* i.e. using scoped_resource<int,close_file> file = open("file.txt",O_RDONLY);
-* in the above example is illegal.
-*
-*/
-template<typename T,typename ReleasePolicy>
-class scoped_resource
-{
-	T resource;
-	ReleasePolicy release;
-	
-	//prohibited operations
-	scoped_resource(const scoped_resource&);
-	scoped_resource& operator=(const scoped_resource&);
-public:
-	typedef T resource_type;
-	typedef ReleasePolicy release_type;
-	
-  /**
-  * Constructor
-	*
-	* @ param res This is the resource to be managed
-	* @ param rel This is the functor to release the object
-  */
-	explicit scoped_resource(resource_type res,release_type rel=release_type())
-			: resource(res), release(rel) {}
-
-  /**
-  * The destructor is the main point in this class. It takes care of proper
-	* deletion of the resource, using the provided release policy.
-	*/
-	~scoped_resource()
-	{
-		release(resource);
-	}
-
-  /**
-  * This operator makes sure you can access and use the scoped_resource
-	* just like you were using the resource itself.
-  *
-  * @ret the underlying resource
-	*/
-	operator resource_type() const { return resource; }
-
-  /**
-  * This function provides explicit access to the resource. Its behaviour
-  * is identical to operator resource_type()
-	*
-	* @ret the underlying resource
-  */
-  resource_type get() const { return resource; }
-
-	/**
-  * This function provides convenient direct access to the -> operator
-  * if the underlying resource is a pointer. Only call this function
-  * if resource_type is a pointer type.
-  */
-	resource_type operator->() const { return resource; }
-
-};
-
-/**
-* A helper policy for scoped_ptr.
-* It will call the delete operator on a pointer, and assign the pointer to 0
-*/
-struct delete_item {
-	template<typename T>
-	void operator()(T*& p) const { delete p; p = 0; }
-};
-/**
-* A helper policy for scoped_array.
-* It will call the delete[] operator on a pointer, and assign the pointer to 0
-*/
-struct delete_array {
-	template<typename T>
-	void operator()(T*& p) const { delete [] p; p = 0; }
-};
-
-/**
-* A class which implements an approximation of
-* template<typename T>
-* typedef scoped_resource<T*,delete_item> scoped_ptr<T>;
-*
-* It is a convenient synonym for a common usage of @ref scoped_resource.
-* See scoped_resource for more details on how this class behaves.
-*
-* Usage example:
-* @code
-* {
-*    const scoped_ptr<Object> ptr(new Object);
-*    ...use ptr as you would a normal Object*...
-* } // ptr is automatically deleted here
-* @endcode
-*
-* NOTE: use this class only to manage a single object, *never* an array.
-* Use scoped_array to manage arrays. This distinction is because you
-* may call delete only on objects allocated with new, delete[] only
-* on objects allocated with new[].
-*/
-template<typename T>
-struct scoped_ptr : public scoped_resource<T*,delete_item>
-{
-	explicit scoped_ptr(T* p) : scoped_resource<T*,delete_item>(p) {}
-};
-
-/**
-* This class has identical behaviour to @ref scoped_ptr, except it manages
-* heap-allocated arrays instead of heap-allocated single objects
-*
-* Usage example:
-* @code
-* {
-*    const scoped_array<char> ptr(new char[n]);
-*    ...use ptr as you would a normal char*...
-* } // ptr is automatically deleted here
-* @endcode
-*
-*/
-template<typename T>
-struct scoped_array : public scoped_resource<T*,delete_array>
-{
-	explicit scoped_array(T* p) : scoped_resource<T*,delete_array>(p) {}
-};
-
-}
-
-#endif
diff --git a/bibletime/xml/Makefile.am b/bibletime/xml/Makefile.am
deleted file mode 100644
index acb432e..0000000
--- a/bibletime/xml/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-EXTRA_DIST = bibletimeui.rc 
-rcdir = $(kde_datadir)/bibletime
-rc_DATA = bibletimeui.rc 
diff --git a/bibletime/xml/Makefile.in b/bibletime/xml/Makefile.in
deleted file mode 100644
index ae674ba..0000000
--- a/bibletime/xml/Makefile.in
+++ /dev/null
@@ -1,512 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-EXTRA_DIST = bibletimeui.rc 
-rcdir = $(kde_datadir)/bibletime
-rc_DATA = bibletimeui.rc 
-subdir = bibletime/xml
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(rc_DATA)
-
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  bibletime/xml/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/xml/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/xml/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-rcDATA_INSTALL = $(INSTALL_DATA)
-install-rcDATA: $(rc_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(rcdir)
-	@list='$(rc_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f"; \
-	  $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f; \
-	done
-
-uninstall-rcDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(rc_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(rcdir)/$$f"; \
-	  rm -f $(DESTDIR)$(rcdir)/$$f; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-
-installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(rcdir)
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-rcDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-rcDATA
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-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-rcDATA 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 uninstall-rcDATA
-
-# 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:
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  bibletime/xml/Makefile
-	cd $(top_srcdir) && perl admin/am_edit bibletime/xml/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/bibletime/xml/bibletimeui.rc b/bibletime/xml/bibletimeui.rc
deleted file mode 100644
index 6866376..0000000
--- a/bibletime/xml/bibletimeui.rc
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"><kpartgui name="BibleTime" version="20">
-<MenuBar>
- <Menu name="file" noMerge="1"><text>&amp;File</text>
-  <Action name="file_clear_queue_action"/>
-  <Action name="file_print"/>
-  <Separator/>
-  <Action name="file_quit"/>
- </Menu>
- <Menu name="search" noMerge="1"><Text>&amp;Search</Text>
- <Action name="groupmanager_searchdefaultbible_action"/>
- <Action name="groupmanager_search_action"/>
- </Menu>
- <Menu name="settings" noMerge="1"><Text>&amp;Settings</Text>
-  <Action name="options_configure_toolbars"/>
-  <Separator/>
-  <Action name="options_configure"/>
-  <Separator/>
-  <Action name="options_sword_setup"/>
- </Menu>
- <Menu name="view" noMerge="1"><Text>&amp;View</Text>
-  <Action name="options_show_toolbar"/>
-  <Separator/>
-  <Action name="viewMainIndex_action"/>
- </Menu>
- <Menu name="window"><Text>&amp;Window</Text>
-  <Action name="windowSaveProfile_action"/>
-  <Action name="windowSaveToNewProfile_action"/>
-  <Action name="windowLoadProfile_action"/>
-  <Action name="windowEditProfiles_action"/>
-  <Separator/>
-  <Action name="windowFullscreen_action"/>
-  <Separator/>
-  <Action name="windowTile_action"/>
-  <Action name="windowCascade_action"/>
-  <Action name="windowAutoTile_action"/>
-  <Action name="windowAutoCascade_action"/>
-  <Separator/>
-  <Action name="windowCloseAll_action"/>
-  <Separator/>
- </Menu>
- <Menu name="help" noMerge="1"><Text>&amp;Help</Text>
-  <Action name="helpHandbook_action"/>
-  <Action name="helpHowTo_action"/>
-  <Separator/>
-  <Action name="help_whats_this"/>
-  <Action name="help_report_bug"/>
-  <Action name="helpDailyTip_action"/>
-  <Separator/>
-  <Action name="help_about_app"/>
-  <Action name="help_about_kde"/>
- </Menu>
-</MenuBar>
-<ToolBar name="mainToolBar" fullWidth="true" noMerge="1" newLine="1">
- <Action name="file_quit"/>
- <Separator/>
- <Action name="groupmanager_search_action"/>
- <Separator/>
- <Action name="file_print"/>
- <Action name="file_clear_queue_action"/>
- <Separator/>
- <Action name="viewMainIndex_action"/>
- <Action name="windowFullscreen_action"/>
- <Separator/>
- <Action name="windowLoadProfile_action"/>
- <Action name="windowSaveToNewProfile_action"/>
- <Separator/>
- <Action name="help_whats_this"/>
-</ToolBar>
-</kpartgui>
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index 8d8c0e2..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,218 +0,0 @@
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* The type of your distribution */
-#undef DISTRIBUTION
-
-/* The version of your distribution */
-#undef DISTRIBUTION_VERSION
-
-/* Define if you have the CoreAudio API */
-#undef HAVE_COREAUDIO
-
-/* Define to 1 if you have the <crt_externs.h> header file. */
-#undef HAVE_CRT_EXTERNS_H
-
-/* Defines if your system has the crypt function */
-#undef HAVE_CRYPT
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define if you have libjpeg */
-#undef HAVE_LIBJPEG
-
-/* Define if you have libpng */
-#undef HAVE_LIBPNG
-
-/* Define if you have a working libpthread (will enable threaded code) */
-#undef HAVE_LIBPTHREAD
-
-/* Define if you have libz */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define if your system needs _NSGetEnviron to set up the environment */
-#undef HAVE_NSGETENVIRON
-
-/* Define if you have the res_init function */
-#undef HAVE_RES_INIT
-
-/* Define if you have a STL implementation by SGI */
-#undef HAVE_SGI_STL
-
-/* Define to 1 if you have the `snprintf' function. */
-#undef HAVE_SNPRINTF
-
-/* 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 if you have strlcat */
-#undef HAVE_STRLCAT
-
-/* Define if you have the strlcat prototype */
-#undef HAVE_STRLCAT_PROTO
-
-/* Define if you have strlcpy */
-#undef HAVE_STRLCPY
-
-/* Define if you have the strlcpy prototype */
-#undef HAVE_STRLCPY_PROTO
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `vsnprintf' function. */
-#undef HAVE_VSNPRINTF
-
-/* Suffix for lib directories */
-#undef KDELIBSUFF
-
-/* 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
-
-/* The size of a `char *', as computed by sizeof. */
-#undef SIZEOF_CHAR_P
-
-/* The size of a `int', as computed by sizeof. */
-#undef SIZEOF_INT
-
-/* The size of a `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-
-/* The size of a `short', as computed by sizeof. */
-#undef SIZEOF_SHORT
-
-/* The size of a `size_t', as computed by sizeof. */
-#undef SIZEOF_SIZE_T
-
-/* The size of a `unsigned long', as computed by sizeof. */
-#undef SIZEOF_UNSIGNED_LONG
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/*
- * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system
- * headers and I'm too lazy to write a configure test as long as only
- * unixware is related
- */
-#ifdef _UNIXWARE
-#define HAVE_BOOLEAN
-#endif
-
-
-
-/*
- * AIX defines FD_SET in terms of bzero, but fails to include <strings.h>
- * that defines bzero.
- */
-
-#if defined(_AIX)
-#include <strings.h>
-#endif
-
-
-
-#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H)
-# include <sys/time.h>
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-#endif
-
-
-
-#if !defined(HAVE_STRLCAT_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long strlcat(char*, const char*, unsigned long);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-#if !defined(HAVE_STRLCPY_PROTO)
-#ifdef __cplusplus
-extern "C" {
-#endif
-unsigned long strlcpy(char*, const char*, unsigned long);
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-
-
-/*
- * On HP-UX, the declaration of vsnprintf() is needed every time !
- */
-
-#if !defined(HAVE_VSNPRINTF) || defined(hpux)
-#if __STDC__
-#include <stdarg.h>
-#include <stdlib.h>
-#else
-#include <varargs.h>
-#endif
-#ifdef __cplusplus
-extern "C"
-#endif
-int vsnprintf(char *str, size_t n, char const *fmt, va_list ap);
-#ifdef __cplusplus
-extern "C"
-#endif
-int snprintf(char *str, size_t n, char const *fmt, ...);
-#endif
-
-
-
-#if defined(__SVR4) && !defined(__svr4__)
-#define __svr4__ 1
-#endif
-
-
-/* Compatibility define */
-#undef ksize_t
-
-/* Define the real type of socklen_t */
-#undef socklen_t
diff --git a/configure b/configure
deleted file mode 100755
index 6cfcc88..0000000
--- a/configure
+++ /dev/null
@@ -1,31595 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57.
-#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# 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
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/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 -n "`(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
-  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"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="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.
-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.
-
-  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="acinclude.m4"
-ac_default_prefix=${KDEDIR:-/usr/local/kde}
-# 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot CONF_FILES 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG KDECONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_libs_prefix kde_libs_htmldir kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDECORE LIB_KDEUI LIB_KIO LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KSYCOCA LIB_KFILE LIB_KFM BT_LDFLAGS SWORD_LIBRARY_PATH LIB_SWORD SWORD_INCLUDES DISTRIBUTION DISTRIBUTION_VERSION RPM_PREFIX RPM_GROUP TOPSUBDIRS LIBOBJS 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]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_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]
-  --disable-fast-perl     disable fast Makefile generation (needs perl)
-  --enable-debug=ARG      enables debug symbols (yes|no|full) default=no
-  --disable-debug         disables debug output and debug symbols default=no
-  --enable-strict         compiles with strict compiler options (may not
-                          work!)
-  --disable-warnings      disables compilation with -Wall and similiar
-  --enable-profile        creates profiling infos default=no
-  --disable-dependency-tracking Speeds up one-time builds
-  --enable-dependency-tracking  Do not reject slow dependency extractors
-  --enable-pch            enables precompiled header support (currently only
-                          KCC) default=no
-  --enable-final          build size optimized apps (experimental - needs lots
-                          of memory)
-  --enable-closure        delay template instantiation
-  --enable-nmcheck        enable automatic namespace cleanness check
-  --enable-shared[=PKGS]
-                          build shared libraries [default=no]
-  --enable-static[=PKGS]
-                          build static libraries [default=yes]
-  --enable-libsuffix      /lib directory suffix (64,32,none=default)
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer
-  --enable-embedded       link to Qt-embedded, don't use X
-  --enable-qtopia         link to Qt-embedded, link to the Qtopia Environment
-  --enable-mac            link to Qt/Mac (don't use X)
-  --disable-mt            link to non-threaded Qt (deprecated)
-  --disable-threading     disables threading even if libpthread found
-  --disable-rpath         do not use the rpath feature of ld
-  --disable-path-check    don't try to find out, where to install
-  --enable-static-linking	use static linking
-  --enable-static-sword    Link to the static Sword library
-
-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]
-  --with-extra-includes=DIR
-                          adds non standard include paths
-  --with-extra-libs=DIR   adds non standard library paths
-  --with-qt-dir=DIR       where the root of Qt is installed
-  --with-qt-includes=DIR  where the Qt includes are.
-  --with-qt-libraries=DIR where the Qt library is installed.
-  --without-arts          build without aRts default=yes
-  --with-sword-dir=DIR     Path where Sword is being installed (default=/usr)
-  --with-distribution=TYPE     The name of your *NIX distribution, e.g. SuSE auto
-  --with-distribution-version=VERSION     Version of your *NIX distribution, e.g. 7.2 auto
-  --with-rpm-prefix=DIR    The directory which should be used as PREFIX
-														in the RPM spec file auto
-  --with-rpm-group=DIR     The group which will be used for the RPM system auto
-
-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
-# 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`
-
-    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 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-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.57.  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.* *.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 admin $srcdir/admin; 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 admin $srcdir/admin" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in admin $srcdir/admin" >&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.
-
-
-unset CDPATH
-
-# 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/'`
-
-
-echo "$as_me:$LINENO: 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
-else
-  ac_cv_target_alias=$target_alias
-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:$LINENO: 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:$LINENO: 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/'`
-target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-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
-
-
-am__api_version="1.7"
-
-
-          test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
-  test -n "$INSTALL_PROGRAM" && kde_save_INSTALL_PROGRAM_given=$INSTALL_PROGRAM
-  test -n "$INSTALL_SCRIPT" && kde_save_INSTALL_SCRIPT_given=$INSTALL_SCRIPT
-  # 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"
-# ./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/* | \
-  /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'
-
-
-  if test -z "$kde_save_INSTALL_given" ; then
-    # OK, user hasn't given any INSTALL, autoconf found one for us
-    # now we test, if it supports the -p flag
-    echo "$as_me:$LINENO: checking for -p flag to install" >&5
-echo $ECHO_N "checking for -p flag to install... $ECHO_C" >&6
-    rm -f confinst.$$.* > /dev/null 2>&1
-    echo "Testtest" > confinst.$$.orig
-    ac_res=no
-    if ${INSTALL} -p confinst.$$.orig confinst.$$.new > /dev/null 2>&1 ; then
-      if test -f confinst.$$.new ; then
-        # OK, -p seems to do no harm to install
-	INSTALL="${INSTALL} -p"
-	ac_res=yes
-      fi
-    fi
-    rm -f confinst.$$.*
-    echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6
-  fi
-
-  if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-    INSTALL_PROGRAM='${INSTALL} $(INSTALL_STRIP_FLAG)'
-  fi
-  if test -z "$kde_save_INSTALL_SCRIPT_given" ; then
-    INSTALL_SCRIPT='${INSTALL}'
-  fi
-
-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
-
-# 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
-
-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=bibletime
- VERSION=1.4.1
-
-
-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"}
-
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-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.
-
-
-
-
-  unset CDPATH
-
-
-  if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
-    ac_configure_args="$ac_configure_args --prefix=$prefix"
-  fi
-  # And delete superfluous '/' to make compares easier
-  prefix=`echo "$prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-  exec_prefix=`echo "$exec_prefix" | sed 's,//*,/,g' | sed -e 's,/$,,'`
-
-    # Check whether --enable-fast-perl or --disable-fast-perl was given.
-if test "${enable_fast_perl+set}" = set; then
-  enableval="$enable_fast_perl"
-  with_fast_perl=$enableval
-else
-  with_fast_perl=yes
-fi;
-
-
-  val=
-  if test -f $srcdir/configure.files ; then
-    val=`sed -e 's%^%\$(top_srcdir)/%' $srcdir/configure.files`
-  fi
-  CONF_FILES=
-  if test -n "$val" ; then
-    for i in $val ; do
-      CONF_FILES="$CONF_FILES $i"
-    done
-  fi
-
-
-
-
-if test -z "3.0"; then
-  # Current default Qt version: 3.2
-  kde_qtver=3
-  kde_qtsubver=2
-else
-  kde_qtsubver=`echo "3.0" | sed -e 's#[0-9][0-9]*\.\([0-9][0-9]*\).*#\1#'`
-  # following is the check if subversion isnt found in passed argument
-  if test "$kde_qtsubver" = "3.0"; then
-    kde_qtsubver=1
-  fi
-  kde_qtver=`echo "3.0" | sed -e 's#^\([0-9][0-9]*\)\..*#\1#'`
-  if test "$kde_qtver" = "1"; then
-    kde_qtsubver=42
-  fi
-fi
-
-if test -z ""; then
-  if test "$kde_qtver" = "2"; then
-    if test $kde_qtsubver -gt 0; then
-      kde_qt_minversion=">= Qt 2.2.2"
-    else
-      kde_qt_minversion=">= Qt 2.0.2"
-    fi
-  fi
-  if test "$kde_qtver" = "3"; then
-    if test $kde_qtsubver -gt 0; then
-	 if test $kde_qtsubver -gt 1; then
-	    kde_qt_minversion=">= Qt 3.2"
-	 else
-            kde_qt_minversion=">= Qt 3.1 (20021021)"
-         fi
-    else
-      kde_qt_minversion=">= Qt 3.0"
-    fi
-  fi
-  if test "$kde_qtver" = "1"; then
-    kde_qt_minversion=">= 1.42 and < 2.0"
-  fi
-else
-   kde_qt_minversion=""
-fi
-
-if test -z ""; then
-   if test $kde_qtver = 3; then
-     if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 0x03@VER@00"
-       qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
-       kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
-     else
-       kde_qt_verstring="QT_VERSION >= 300"
-     fi
-   fi
-   if test $kde_qtver = 2; then
-     if test $kde_qtsubver -gt 0; then
-       kde_qt_verstring="QT_VERSION >= 222"
-     else
-       kde_qt_verstring="QT_VERSION >= 200"
-     fi
-   fi
-   if test $kde_qtver = 1; then
-    kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
-   fi
-else
-   kde_qt_verstring=""
-fi
-
-if test $kde_qtver = 3; then
-  kde_qt_dirs="$QTDIR /usr/lib/qt3 /usr/lib/qt /usr/share/qt3"
-fi
-if test $kde_qtver = 2; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt2 /usr/lib/qt"
-fi
-if test $kde_qtver = 1; then
-   kde_qt_dirs="$QTDIR /usr/lib/qt"
-fi
-
-
-          ac_config_headers="$ac_config_headers config.h"
-
-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
-
-
-
-
-
-  # Check whether --enable-debug or --disable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval="$enable_debug"
-
-    case $enableval in
-      yes)
-        kde_use_debug_code="yes"
-        kde_use_debug_define=no
-        ;;
-      full)
-        kde_use_debug_code="full"
-        kde_use_debug_define=no
-        ;;
-      *)
-        kde_use_debug_code="no"
-        kde_use_debug_define=yes
-        ;;
-    esac
-
-else
-  kde_use_debug_code="no"
-      kde_use_debug_define=no
-
-fi;
-
-    # Check whether --enable-dummyoption or --disable-dummyoption was given.
-if test "${enable_dummyoption+set}" = set; then
-  enableval="$enable_dummyoption"
-
-fi;
-
-  # Check whether --enable-strict or --disable-strict was given.
-if test "${enable_strict+set}" = set; then
-  enableval="$enable_strict"
-
-    if test $enableval = "no"; then
-         kde_use_strict_options="no"
-       else
-         kde_use_strict_options="yes"
-    fi
-
-else
-  kde_use_strict_options="no"
-fi;
-
-  # Check whether --enable-warnings or --disable-warnings was given.
-if test "${enable_warnings+set}" = set; then
-  enableval="$enable_warnings"
-
-    if test $enableval = "no"; then
-         kde_use_warnings="no"
-       else
-         kde_use_warnings="yes"
-    fi
-
-else
-  kde_use_warnings="yes"
-fi;
-
-    if test "$kde_use_debug_code" != "no"; then
-    kde_use_warnings=yes
-  fi
-
-  # Check whether --enable-profile or --disable-profile was given.
-if test "${enable_profile+set}" = set; then
-  enableval="$enable_profile"
-  kde_use_profiling=$enableval
-else
-  kde_use_profiling="no"
-
-fi;
-
-    CFLAGS=" $CFLAGS"
-
-  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
-/* #line $LINENO "configure" */
-/* 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" >&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:$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
-/* #line $LINENO "configure" */
-/* 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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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;
-}
-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
-  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.$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>&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);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.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>&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.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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>&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.$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.$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
-
-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
-      : > 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
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' 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
-/* #line $LINENO "configure" */
-/* 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
-  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
-/* #line $LINENO "configure" */
-/* 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
-  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
-/* #line $LINENO "configure" */
-/* 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
-  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
-/* #line $LINENO "configure" */
-/* 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
-  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
-
-
-  if test "$GCC" = "yes"; then
-    if test "$kde_use_debug_code" != "no"; then
-      if test $kde_use_debug_code = "full"; then
-        CFLAGS="-g3 -fno-inline $CFLAGS"
-      else
-        CFLAGS="-g -O2 $CFLAGS"
-      fi
-    else
-      CFLAGS="-O2 $CFLAGS"
-    fi
-  fi
-
-  if test "$kde_use_debug_define" = "yes"; then
-    CFLAGS="-DNDEBUG $CFLAGS"
-  fi
-
-
-  case "$host" in
-  *-*-sysv4.2uw*) CFLAGS="-D_UNIXWARE $CFLAGS";;
-  *-*-sysv5uw7*) CFLAGS="-D_UNIXWARE7 $CFLAGS";;
-  esac
-
-  if test -z "$LDFLAGS" && test "$kde_use_debug_code" = "no" && test "$GCC" = "yes"; then
-     LDFLAGS=""
-  fi
-
-  CXXFLAGS=" $CXXFLAGS"
-
-  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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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 \
-   ''\
-   '#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);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.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>&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.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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>&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.$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=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$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
-      : > 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
-      # (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored.
-      if grep 'ignoring option' 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 "$GXX" = "yes" || test "$CXX" = "KCC"; then
-    if test "$kde_use_debug_code" != "no"; then
-      if test "$CXX" = "KCC"; then
-        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-      else
-        if test "$kde_use_debug_code" = "full"; then
-          CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
-        else
-          CXXFLAGS="-g -O2 $CXXFLAGS"
-        fi
-      fi
-
-echo "$as_me:$LINENO: checking whether $CXX supports -fno-builtin" >&5
-echo $ECHO_N "checking whether $CXX supports -fno-builtin... $ECHO_C" >&6
-kde_cache=`echo fno-builtin | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-
-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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -fno-builtin"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="-fno-builtin $CXXFLAGS"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-
-
-echo "$as_me:$LINENO: checking whether $CXX supports -Woverloaded-virtual" >&5
-echo $ECHO_N "checking whether $CXX supports -Woverloaded-virtual... $ECHO_C" >&6
-kde_cache=`echo Woverloaded-virtual | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Woverloaded-virtual"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- WOVERLOADED_VIRTUAL="-Woverloaded-virtual"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
- WOVERLOADED_VRITUAL=""
-fi
-
-
-    else
-      if test "$CXX" = "KCC"; then
-        CXXFLAGS="+K3 $CXXFLAGS"
-      else
-        CXXFLAGS="-O2 $CXXFLAGS"
-      fi
-    fi
-  fi
-
-  if test "$kde_use_debug_define" = "yes"; then
-    CXXFLAGS="-DNDEBUG -DNO_DEBUG $CXXFLAGS"
-  fi
-
-  if test "$kde_use_profiling" = "yes"; then
-
-echo "$as_me:$LINENO: checking whether $CXX supports -pg" >&5
-echo $ECHO_N "checking whether $CXX supports -pg... $ECHO_C" >&6
-kde_cache=`echo pg | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -pg"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
-
-      CFLAGS="-pg $CFLAGS"
-      CXXFLAGS="-pg $CXXFLAGS"
-
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-  fi
-
-  if test "$kde_use_warnings" = "yes"; then
-      if test "$GCC" = "yes"; then
-        case $host in
-          *-*-linux-gnu)
-            CFLAGS="-ansi -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
-            CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
-
-echo "$as_me:$LINENO: checking whether $CXX supports -Wmissing-format-attribute" >&5
-echo $ECHO_N "checking whether $CXX supports -Wmissing-format-attribute... $ECHO_C" >&6
-kde_cache=`echo Wmissing-format-attribute | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wmissing-format-attribute"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"; CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-          ;;
-        esac
-        CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
-
-echo "$as_me:$LINENO: checking whether $CXX supports -Wundef" >&5
-echo $ECHO_N "checking whether $CXX supports -Wundef... $ECHO_C" >&6
-kde_cache=`echo Wundef | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wundef"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="-Wundef $CXXFLAGS"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-
-echo "$as_me:$LINENO: checking whether $CXX supports -Wno-long-long" >&5
-echo $ECHO_N "checking whether $CXX supports -Wno-long-long... $ECHO_C" >&6
-kde_cache=`echo Wno-long-long | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wno-long-long"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="-Wno-long-long $CXXFLAGS"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-
-echo "$as_me:$LINENO: checking whether $CXX supports -Wnon-virtual-dtor" >&5
-echo $ECHO_N "checking whether $CXX supports -Wnon-virtual-dtor... $ECHO_C" >&6
-kde_cache=`echo Wnon-virtual-dtor | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wnon-virtual-dtor"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-     fi
-  fi
-
-  if test "$GXX" = "yes" && test "$kde_use_strict_options" = "yes"; then
-    CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
-  fi
-
-  if test "$GXX" = "yes"; then
-
-echo "$as_me:$LINENO: checking whether $CXX supports -fno-exceptions" >&5
-echo $ECHO_N "checking whether $CXX supports -fno-exceptions... $ECHO_C" >&6
-kde_cache=`echo fno-exceptions | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -fno-exceptions"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="$CXXFLAGS -fno-exceptions"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-
-echo "$as_me:$LINENO: checking whether $CXX supports -fno-check-new" >&5
-echo $ECHO_N "checking whether $CXX supports -fno-check-new... $ECHO_C" >&6
-kde_cache=`echo fno-check-new | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -fno-check-new"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="$CXXFLAGS -fno-check-new"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-
-echo "$as_me:$LINENO: checking whether $CXX supports -fno-common" >&5
-echo $ECHO_N "checking whether $CXX supports -fno-common... $ECHO_C" >&6
-kde_cache=`echo fno-common | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -fno-common"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="$CXXFLAGS -fno-common"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-
-echo "$as_me:$LINENO: checking whether $CXX supports -fexceptions" >&5
-echo $ECHO_N "checking whether $CXX supports -fexceptions... $ECHO_C" >&6
-kde_cache=`echo fexceptions | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -fexceptions"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- USE_EXCEPTIONS="-fexceptions"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
- USE_EXCEPTIONS=
-fi
-
-  fi
-  if test "$CXX" = "KCC"; then
-
-    # Check whether --enable-pch or --disable-pch was given.
-if test "${enable_pch+set}" = set; then
-  enableval="$enable_pch"
-
-      kde_use_pch=$enableval
-
-else
-  kde_use_pch=no
-fi;
-
-    if test "$kde_use_pch" = "yes"; then
-
-echo "$as_me:$LINENO: checking whether $CXX supports --pch" >&5
-echo $ECHO_N "checking whether $CXX supports --pch... $ECHO_C" >&6
-kde_cache=`echo -pch | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS --pch"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="$CXXFLAGS --pch"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-                                              fi
-
-echo "$as_me:$LINENO: checking whether $CXX supports --inline_keyword_space_time=6" >&5
-echo $ECHO_N "checking whether $CXX supports --inline_keyword_space_time=6... $ECHO_C" >&6
-kde_cache=`echo -inline_keyword_space_time=6 | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="$CXXFLAGS --inline_keyword_space_time=6"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-
-echo "$as_me:$LINENO: checking whether $CXX supports --inline_auto_space_time=2" >&5
-echo $ECHO_N "checking whether $CXX supports --inline_auto_space_time=2... $ECHO_C" >&6
-kde_cache=`echo -inline_auto_space_time=2 | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="$CXXFLAGS --inline_auto_space_time=2"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-
-echo "$as_me:$LINENO: checking whether $CXX supports --inline_implicit_space_time=2.0" >&5
-echo $ECHO_N "checking whether $CXX supports --inline_implicit_space_time=2.0... $ECHO_C" >&6
-kde_cache=`echo -inline_implicit_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="$CXXFLAGS --inline_implicit_space_time=2.0"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-
-echo "$as_me:$LINENO: checking whether $CXX supports --inline_generated_space_time=2.0" >&5
-echo $ECHO_N "checking whether $CXX supports --inline_generated_space_time=2.0... $ECHO_C" >&6
-kde_cache=`echo -inline_generated_space_time=2.0 | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="$CXXFLAGS --inline_generated_space_time=2.0"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-
-echo "$as_me:$LINENO: checking whether $CXX supports --one_per" >&5
-echo $ECHO_N "checking whether $CXX supports --one_per... $ECHO_C" >&6
-kde_cache=`echo -one_per | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS --one_per"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- CXXFLAGS="$CXXFLAGS --one_per"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-  fi
-
-    USE_RTTI=
-
-
-  case "$host" in
-      *-*-irix*)  test "$GXX" = yes && CXXFLAGS="-D_LANGUAGE_C_PLUS_PLUS -D__LANGUAGE_C_PLUS_PLUS $CXXFLAGS" ;;
-      *-*-sysv4.2uw*) CXXFLAGS="-D_UNIXWARE $CXXFLAGS";;
-      *-*-sysv5uw7*) CXXFLAGS="-D_UNIXWARE7 $CXXFLAGS";;
-      *-*-solaris*)
-        if test "$GXX" = yes; then
-          libstdcpp=`$CXX -print-file-name=libstdc++.so`
-          if test ! -f $libstdcpp; then
-             { { echo "$as_me:$LINENO: error: You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so" >&5
-echo "$as_me: error: You've compiled gcc without --enable-shared. This doesn't work with KDE. Please recompile gcc with --enable-shared to receive a libstdc++.so" >&2;}
-   { (exit 1); exit 1; }; }
-          fi
-        fi
-        ;;
-  esac
-
-  if test "x$kde_use_qt_emb" != "xyes"; then
-  __val=$CXX
-  __forbid=" -fno-rtti -rpath "
-  if test -n "$__val"; then
-    __new=""
-    ac_save_IFS=$IFS
-    IFS=" 	"
-    for i in $__val; do
-      case "$__forbid" in
-        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXX, removing it" >&5
-echo "$as_me: WARNING: found forbidden $i in CXX, removing it" >&2;} ;;
-	*) # Careful to not add spaces, where there were none, because otherwise
-	   # libtool gets confused, if we change e.g. CXX
-	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-      esac
-    done
-    IFS=$ac_save_IFS
-    CXX=$__new
-  fi
-
-  __val=$CXXFLAGS
-  __forbid=" -fno-rtti -rpath "
-  if test -n "$__val"; then
-    __new=""
-    ac_save_IFS=$IFS
-    IFS=" 	"
-    for i in $__val; do
-      case "$__forbid" in
-        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXXFLAGS, removing it" >&5
-echo "$as_me: WARNING: found forbidden $i in CXXFLAGS, removing it" >&2;} ;;
-	*) # Careful to not add spaces, where there were none, because otherwise
-	   # libtool gets confused, if we change e.g. CXX
-	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-      esac
-    done
-    IFS=$ac_save_IFS
-    CXXFLAGS=$__new
-  fi
-
-else
-  __val=$CXX
-  __forbid=" -rpath "
-  if test -n "$__val"; then
-    __new=""
-    ac_save_IFS=$IFS
-    IFS=" 	"
-    for i in $__val; do
-      case "$__forbid" in
-        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXX, removing it" >&5
-echo "$as_me: WARNING: found forbidden $i in CXX, removing it" >&2;} ;;
-	*) # Careful to not add spaces, where there were none, because otherwise
-	   # libtool gets confused, if we change e.g. CXX
-	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-      esac
-    done
-    IFS=$ac_save_IFS
-    CXX=$__new
-  fi
-
-  __val=$CXXFLAGS
-  __forbid=" -rpath "
-  if test -n "$__val"; then
-    __new=""
-    ac_save_IFS=$IFS
-    IFS=" 	"
-    for i in $__val; do
-      case "$__forbid" in
-        *" $i "*) { echo "$as_me:$LINENO: WARNING: found forbidden $i in CXXFLAGS, removing it" >&5
-echo "$as_me: WARNING: found forbidden $i in CXXFLAGS, removing it" >&2;} ;;
-	*) # Careful to not add spaces, where there were none, because otherwise
-	   # libtool gets confused, if we change e.g. CXX
-	   if test -z "$__new" ; then __new=$i ; else __new="$__new $i" ; fi ;;
-      esac
-    done
-    IFS=$ac_save_IFS
-    CXXFLAGS=$__new
-  fi
-
-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
-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
-/* #line $LINENO "configure" */
-/* 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
-  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
-/* #line $LINENO "configure" */
-/* 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
-  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
-/* #line $LINENO "configure" */
-/* 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
-  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
-/* #line $LINENO "configure" */
-/* 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
-  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=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 "$GCC" = yes; then
-     NOOPT_CFLAGS=-O0
-  fi
-
-echo "$as_me:$LINENO: checking whether $CXX supports -O0" >&5
-echo $ECHO_N "checking whether $CXX supports -O0... $ECHO_C" >&6
-kde_cache=`echo O0 | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -O0"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- NOOPT_CXXFLAGS=-O0
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-
-
-
-
-
-  # Check whether --enable-final or --disable-final was given.
-if test "${enable_final+set}" = set; then
-  enableval="$enable_final"
-  kde_use_final=$enableval
-else
-  kde_use_final=no
-fi;
-
-  if test "x$kde_use_final" = "xyes"; then
-      KDE_USE_FINAL_TRUE=""
-      KDE_USE_FINAL_FALSE="#"
-   else
-      KDE_USE_FINAL_TRUE="#"
-      KDE_USE_FINAL_FALSE=""
-  fi
-
-
-
-
-  # Check whether --enable-closure or --disable-closure was given.
-if test "${enable_closure+set}" = set; then
-  enableval="$enable_closure"
-  kde_use_closure=$enableval
-else
-  kde_use_closure=no
-fi;
-
-  KDE_NO_UNDEFINED=""
-  if test "x$kde_use_closure" = "xyes"; then
-       KDE_USE_CLOSURE_TRUE=""
-       KDE_USE_CLOSURE_FALSE="#"
-#       CXXFLAGS="$CXXFLAGS $REPO"
-  else
-       KDE_USE_CLOSURE_TRUE="#"
-       KDE_USE_CLOSURE_FALSE=""
-       KDE_NO_UNDEFINED=""
-       case $host in
-         *-*-linux-gnu)
-
-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
-kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
-
-echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
-echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
-kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
- KDE_NO_UNDEFINED=""
-fi
-
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
- KDE_NO_UNDEFINED=""
-fi
-
-           ;;
-       esac
-  fi
-
-
-
-
-
-  # Check whether --enable-nmcheck or --disable-nmcheck was given.
-if test "${enable_nmcheck+set}" = set; then
-  enableval="$enable_nmcheck"
-  kde_use_nmcheck=$enableval
-else
-  kde_use_nmcheck=no
-fi;
-
-  if test "$kde_use_nmcheck" = "yes"; then
-      KDE_USE_NMCHECK_TRUE=""
-      KDE_USE_NMCHECK_FALSE="#"
-   else
-      KDE_USE_NMCHECK_TRUE="#"
-      KDE_USE_NMCHECK_FALSE=""
-  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;
-
-
-
-
-    kdelibsuff=no
-    # Check whether --enable-libsuffix or --disable-libsuffix was given.
-if test "${enable_libsuffix+set}" = set; then
-  enableval="$enable_libsuffix"
-  kdelibsuff=$enableval
-fi;
-    # TODO: add an auto case that compiles a little C app to check
-    # where the glibc is
-    if test "$kdelibsuff" = "no"; then
-       kdelibsuff=
-    fi
-    if test -z "$kdelibsuff"; then
-        echo "$as_me:$LINENO: result: not using lib directory suffix" >&5
-echo "${ECHO_T}not using lib directory suffix" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define KDELIBSUFF ""
-_ACEOF
-
-    else
-        if test "$libdir" = '${exec_prefix}/lib'; then
-            libdir="$libdir${kdelibsuff}"
-            libdir="$libdir"
-          fi
-
-cat >>confdefs.h <<_ACEOF
-#define KDELIBSUFF "\"${kdelibsuff}\""
-_ACEOF
-
-        echo "$as_me:$LINENO: result: using lib directory suffix $kdelibsuff" >&5
-echo "${ECHO_T}using lib directory suffix $kdelibsuff" >&6
-    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
-
-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
-
-
-
-# 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'
-
-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
-  ;;
-
-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
-  ;;
-
-cygwin* | mingw* | pw32*)
-  # 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='win32_libid'
-  ;;
-
-darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  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=`/System/Library/Frameworks/System.framework/System`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
-    ;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-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
-  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 $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 must be Linux ELF.
-linux*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  # the debian people say, arm and glibc 2.3.1 works for them with pass_all
-  arm* )
-    lt_cv_deplibs_check_method=pass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
-  esac
-  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]+|_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*)
-  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
-  ;;
-
-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
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  lt_cv_file_magic_test_file=/lib/libc.so
-  ;;
-
-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 6575 "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*)
-      LINUX_64_MODE="32"
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*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*)
-      LINUX_64_MODE="64"
-      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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-  ;;
-
-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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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
-/* #line $LINENO "configure" */
-/* 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
-/* #line $LINENO "configure" */
-/* 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.* *.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
-/* #line $LINENO "configure" */
-/* 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
-  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.$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
-/* #line $LINENO "configure" */
-/* 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
-  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.$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
-/* #line $LINENO "configure" */
-/* 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
-  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 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;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-  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: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_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=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 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
-  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 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
-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:7187:" \
-     "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); }
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.
-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>&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.$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
-G77=`test $ac_compiler_gnu = yes && echo yes`
-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>&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.$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 "$G77" = yes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
-else
-  if test "$G77" = yes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
-  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
-
-
-
-# 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
-  testring="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;
-    ;;
-
- *)
-    # 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.
-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
-	       = "XX$testring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      testring=$testring$testring
-    done
-    testring=
-    # 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'"
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris* | sysv5*)
-  symcode='[BDT]'
-  ;;
-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='[ABCDGISTW]' ;;
-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
-
-# 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=yes
-enable_win32_dll=no
-
-# 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:8193: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:8197: \$? = $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
-      ;;
-
-    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:8426: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:8430: \$? = $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
-
-   # 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 .
-
-   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:8493: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:8497: \$? = $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* 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
-      ;;
-
-    *)
-      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
-
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
-	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='-qmkshrobj ${wl}-G'
-	  else
-	    shared_flag='-qmkshrobj'
-  	fi
-	fi
-      fi
-
-      # Let the compiler handle the export list.
-      always_export_symbols=no
-      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
-/* #line $LINENO "configure" */
-/* 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>&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.$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_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` '" $shared_flag"
-	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}$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-      ;;
-
-    bsdi4*)
-      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=".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*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep '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='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds='$CC -r ${wl}-bind_at_load -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='$CC ${wl}-bind_at_load $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='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='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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='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}'
-      hardcode_direct=no
-      hardcode_automatic=yes
-      hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec='-all_load $convenience'
-      link_all_deplibs=yes
-    else
-      ld_shlibs=no
-    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*)
-      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'
-	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=".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"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-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
-  ;;
-
-bsdi4*)
-  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=".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='$(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
-  ;;
-
-freebsd*-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='.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='.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='.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'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
-      libsuff=64
-    fi
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-  # 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'
-  ;;
-
-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}${release}${shared_ext} ${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=".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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* 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
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* 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
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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 10499 "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 10597 "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*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    archive_cmds_need_lc=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
-      ;;
-    esac
-    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}'
-    hardcode_direct=no
-    hardcode_automatic=yes
-    hardcode_shlibpath_var=unsupported
-    whole_archive_flag_spec='-all_load $convenience'
-    link_all_deplibs=yes
-  else
-    ld_shlibs=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 \
-    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.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# 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=$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='$shrext'
-
-# 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.
-  test -f Makefile && make "$ltmain"
-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"; 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
-      # KDE requires run time linking.  Make it the default.
-      aix_use_runtimelinking=yes
-      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='-qmkshrobj ${wl}-G'
-	else
-	  shared_flag='-qmkshrobj'
-	fi
-      fi
-    fi
-
-    # Let the compiler handle the export list.
-    always_export_symbols_CXX=no
-    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
-/* #line $LINENO "configure" */
-/* 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>&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.$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_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` '" $shared_flag"
-      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}$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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*)
-  if test "$GXX" = yes; then
-    archive_cmds_need_lc_CXX=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag_CXX='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep '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 ${wl}-bind_at_load -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 ${wl}-bind_at_load $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 ${wl}-bind_at_load -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}'
-    hardcode_direct_CXX=no
-    hardcode_automatic_CXX=yes
-    hardcode_shlibpath_var_CXX=unsupported
-    whole_archive_flag_spec_CXX='-all_load $convenience'
-    link_all_deplibs_CXX=yes
-  else
-    ld_shlibs_CXX=no
-  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*)
-    # 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) | egrep "\-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
-	archive_cmds_need_lc_CXX=no
-	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'
-	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::"'
-    ;;
-  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|*.$libext)
-       # 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
-	;;
-      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*)
-	# 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:12716: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:12720: \$? = $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
-
-   # 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 .
-
-   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:12783: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:12787: \$? = $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* 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=".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"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-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
-  ;;
-
-bsdi4*)
-  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=".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='$(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
-  ;;
-
-freebsd*-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='.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='.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='.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'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
-      libsuff=64
-    fi
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-  # 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'
-  ;;
-
-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}${release}${shared_ext} ${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=".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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* 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
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* 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
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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 14033 "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 14131 "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 \
-    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=$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='$shrext'
-
-# 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.
-  test -f Makefile && make "$ltmain"
-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*)
-  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
-      ;;
-
-    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:14954: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:14958: \$? = $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
-
-   # 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 .
-
-   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:15021: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:15025: \$? = $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* 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
-      ;;
-
-    *)
-      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
-
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
-	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='-qmkshrobj ${wl}-G'
-	  else
-	    shared_flag='-qmkshrobj'
-  	fi
-	fi
-      fi
-
-      # Let the compiler handle the export list.
-      always_export_symbols_F77=no
-      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>&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.$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_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` '" $shared_flag"
-	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}$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>&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.$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
-      ;;
-
-    bsdi4*)
-      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=".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*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_F77=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_F77='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep '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_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_F77='$CC -r ${wl}-bind_at_load -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_F77='$CC ${wl}-bind_at_load $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_F77='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_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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_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}'
-      hardcode_direct_F77=no
-      hardcode_automatic_F77=yes
-      hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77='-all_load $convenience'
-      link_all_deplibs_F77=yes
-    else
-      ld_shlibs_F77=no
-    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*)
-      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'
-	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=".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"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-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
-  ;;
-
-bsdi4*)
-  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=".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='$(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
-  ;;
-
-freebsd*-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='.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='.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='.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'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
-      libsuff=64
-    fi
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-  # 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'
-  ;;
-
-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}${release}${shared_ext} ${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=".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 \
-    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=$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='$shrext'
-
-# 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.
-  test -f Makefile && make "$ltmain"
-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:16957: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:16961: \$? = $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
-      ;;
-
-    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:17190: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:17194: \$? = $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
-
-   # 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 .
-
-   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:17257: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:17261: \$? = $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* 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
-      ;;
-
-    *)
-      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
-
-	# KDE requires run time linking.  Make it the default.
-	aix_use_runtimelinking=yes
-	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='-qmkshrobj ${wl}-G'
-	  else
-	    shared_flag='-qmkshrobj'
-  	fi
-	fi
-      fi
-
-      # Let the compiler handle the export list.
-      always_export_symbols_GCJ=no
-      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
-/* #line $LINENO "configure" */
-/* 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>&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.$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_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` '" $shared_flag"
-	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}$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-      ;;
-
-    bsdi4*)
-      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=".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*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_GCJ=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_GCJ='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep '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_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -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_GCJ='$CC ${wl}-bind_at_load $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_GCJ='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_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -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_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}'
-      hardcode_direct_GCJ=no
-      hardcode_automatic_GCJ=yes
-      hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ='-all_load $convenience'
-      link_all_deplibs_GCJ=yes
-    else
-      ld_shlibs_GCJ=no
-    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*)
-      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'
-	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=".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"
-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-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
-  ;;
-
-bsdi4*)
-  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=".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='$(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
-  ;;
-
-freebsd*-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='.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='.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='.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'
-  libsuff=
-  if test "x$LINUX_64_MODE" = x64; then
-    # Some platforms are per default 64-bit, so there's no /lib64
-    if test -d /lib64; then
-      libsuff=64
-    fi
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
-  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
-  # 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'
-  ;;
-
-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}${release}${shared_ext} ${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=".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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* 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
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* 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
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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.$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 19263 "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 19361 "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 \
-    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=$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='$shrext'
-
-# 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.
-  test -f Makefile && make "$ltmain"
-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 \
-    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=$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='$shrext'
-
-# 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.
-  test -f Makefile && make "$ltmain"
-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 --silent'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-LIBTOOL_SHELL="/bin/sh ./libtool"
-#  LIBTOOL="$LIBTOOL --silent"
-KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
-
-
-# we patch configure quite some so we better keep that consistent for incremental runs
-AUTOCONF='$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch configure'
-
-
-
-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
-
-
-
-
-
-    # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; 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_path_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case "$MSGFMT" in
-  /*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -n "`$ac_dir/$ac_word --version 2>&1 | grep 'GNU gettext'`"; then
-	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
-  ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
-  echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; 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_path_GMSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-
-if test -n "$GMSGFMT"; then
-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
-     if test -z "`$GMSGFMT --version 2>&1 | grep 'GNU gettext'`"; then
-        echo "$as_me:$LINENO: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
-        GMSGFMT=":"
-      fi
-      MSGFMT=$GMSGFMT
-
-
-
-      # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; 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_path_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case "$XGETTEXT" in
-  /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-  ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
-  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-
-            if test "$XGETTEXT" != ":"; then
-			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6
-	  XGETTEXT=":"
-	fi
-      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
-
-ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-    ac_save_CXXFLAGS="$CXXFLAGS"
-    CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
-
-    echo "$as_me:$LINENO: checking if C++ programs can be compiled" >&5
-echo $ECHO_N "checking if C++ programs can be compiled... $ECHO_C" >&6
-    if test "${kde_cv_stl_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-      cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <string>
-using namespace std;
-
-int
-main ()
-{
-
-  string astring="Hallo Welt.";
-  astring.erase(0, 6); // now astring is "Welt"
-  return 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
-  kde_cv_stl_works=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-kde_cv_stl_works=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-fi
-
-
-   echo "$as_me:$LINENO: result: $kde_cv_stl_works" >&5
-echo "${ECHO_T}$kde_cv_stl_works" >&6
-
-   if test "$kde_cv_stl_works" = "yes"; then
-     # back compatible
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_SGI_STL 1
-_ACEOF
-
-   else
-	 { { echo "$as_me:$LINENO: error: Your Installation isn't able to compile simple C++ programs.
-Check config.log for details - if you're using a Linux distribution you might miss
-a package named similiar to libstd++-dev." >&5
-echo "$as_me: error: Your Installation isn't able to compile simple C++ programs.
-Check config.log for details - if you're using a Linux distribution you might miss
-a package named similiar to libstd++-dev." >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   CXXFLAGS="$ac_save_CXXFLAGS"
-   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 strlcat" >&5
-echo $ECHO_N "checking for strlcat... $ECHO_C" >&6
-if test "${kde_cv_func_strlcat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
- 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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-save_CXXFLAGS="$CXXFLAGS"
-kde_safe_LIBS="$LIBS"
-LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-#include <string.h>
-
-
-int
-main ()
-{
-
- char buf[20];
-  buf[0]='\0';
-  strlcat(buf, "KDE function test", sizeof(buf));
-
-
-  ;
-  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
-  kde_cv_func_strlcat=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-kde_cv_func_strlcat=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-CXXFLAGS="$save_CXXFLAGS"
-LIBS="$kde_safe_LIBS"
-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: $kde_cv_func_strlcat" >&5
-echo "${ECHO_T}$kde_cv_func_strlcat" >&6
-
-echo "$as_me:$LINENO: checking if strlcat needs custom prototype" >&5
-echo $ECHO_N "checking if strlcat needs custom prototype... $ECHO_C" >&6
-if test "${kde_cv_proto_strlcat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if test "x$kde_cv_func_strlcat" = xyes; then
-  kde_cv_proto_strlcat=no
-else
-  case "strlcat" in
-	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_strlcat="yes - in libkdefakes"
-		;;
-	*)
-		kde_cv_proto_strlcat=unknown
-		;;
-  esac
-fi
-
-if test "x$kde_cv_proto_strlcat" = xunknown; 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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  kde_safe_libs=$LIBS
-  LIBS="$LIBS $X_EXTRA_LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-#include <string.h>
-
-
-extern "C" unsigned long strlcat(char*, const char*, unsigned long);
-
-int
-main ()
-{
-
- char buf[20];
-  buf[0]='\0';
-  strlcat(buf, "KDE function test", sizeof(buf));
-
-
-  ;
-  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
-   kde_cv_func_strlcat=yes
-  kde_cv_proto_strlcat=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-kde_cv_proto_strlcat="strlcat unavailable"
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$kde_safe_libs
-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
-
-fi
-
-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcat" >&5
-echo "${ECHO_T}$kde_cv_proto_strlcat" >&6
-
-if test "x$kde_cv_func_strlcat" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRLCAT 1
-_ACEOF
-
-
-fi
-if test "x$kde_cv_proto_strlcat" = xno; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRLCAT_PROTO 1
-_ACEOF
-
-fi
-
-
-
-
-
-
-
-echo "$as_me:$LINENO: checking for strlcpy" >&5
-echo $ECHO_N "checking for strlcpy... $ECHO_C" >&6
-if test "${kde_cv_func_strlcpy+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
- 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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-save_CXXFLAGS="$CXXFLAGS"
-kde_safe_LIBS="$LIBS"
-LIBS="$LIBS $X_EXTRA_LIBS"
-if test "$GXX" = "yes"; then
-CXXFLAGS="$CXXFLAGS -pedantic-errors"
-fi
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-#include <string.h>
-
-
-int
-main ()
-{
-
- char buf[20];
-  strlcpy(buf, "KDE function test", sizeof(buf));
-
-
-  ;
-  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
-  kde_cv_func_strlcpy=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-kde_cv_func_strlcpy=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-CXXFLAGS="$save_CXXFLAGS"
-LIBS="$kde_safe_LIBS"
-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: $kde_cv_func_strlcpy" >&5
-echo "${ECHO_T}$kde_cv_func_strlcpy" >&6
-
-echo "$as_me:$LINENO: checking if strlcpy needs custom prototype" >&5
-echo $ECHO_N "checking if strlcpy needs custom prototype... $ECHO_C" >&6
-if test "${kde_cv_proto_strlcpy+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if test "x$kde_cv_func_strlcpy" = xyes; then
-  kde_cv_proto_strlcpy=no
-else
-  case "strlcpy" in
-	setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
-		kde_cv_proto_strlcpy="yes - in libkdefakes"
-		;;
-	*)
-		kde_cv_proto_strlcpy=unknown
-		;;
-  esac
-fi
-
-if test "x$kde_cv_proto_strlcpy" = xunknown; 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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  kde_safe_libs=$LIBS
-  LIBS="$LIBS $X_EXTRA_LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-#include <string.h>
-
-
-extern "C" unsigned long strlcpy(char*, const char*, unsigned long);
-
-int
-main ()
-{
-
- char buf[20];
-  strlcpy(buf, "KDE function test", sizeof(buf));
-
-
-  ;
-  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
-   kde_cv_func_strlcpy=yes
-  kde_cv_proto_strlcpy=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-kde_cv_proto_strlcpy="strlcpy unavailable"
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$kde_safe_libs
-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
-
-fi
-
-echo "$as_me:$LINENO: result: $kde_cv_proto_strlcpy" >&5
-echo "${ECHO_T}$kde_cv_proto_strlcpy" >&6
-
-if test "x$kde_cv_func_strlcpy" = xyes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRLCPY 1
-_ACEOF
-
-
-fi
-if test "x$kde_cv_proto_strlcpy" = xno; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRLCPY_PROTO 1
-_ACEOF
-
-fi
-
-
-
-
-
-
-      echo "$as_me:$LINENO: checking for main in -lutil" >&5
-echo $ECHO_N "checking for main in -lutil... $ECHO_C" >&6
-if test "${ac_cv_lib_util_main+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 $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-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
-  ac_cv_lib_util_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_util_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_util_main" >&5
-echo "${ECHO_T}$ac_cv_lib_util_main" >&6
-if test $ac_cv_lib_util_main = yes; then
-  LIBUTIL="-lutil"
-fi
-
-   echo "$as_me:$LINENO: checking for main in -lcompat" >&5
-echo $ECHO_N "checking for main in -lcompat... $ECHO_C" >&6
-if test "${ac_cv_lib_compat_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcompat  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-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
-  ac_cv_lib_compat_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_compat_main=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_compat_main" >&5
-echo "${ECHO_T}$ac_cv_lib_compat_main" >&6
-if test $ac_cv_lib_compat_main = yes; then
-  LIBCOMPAT="-lcompat"
-fi
-
-   kde_have_crypt=
-   echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypt  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 crypt ();
-int
-main ()
-{
-crypt ();
-  ;
-  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
-  ac_cv_lib_crypt_crypt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_crypt_crypt=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
-if test $ac_cv_lib_crypt_crypt = yes; then
-  LIBCRYPT="-lcrypt"; kde_have_crypt=yes
-else
-  echo "$as_me:$LINENO: checking for crypt in -lc" >&5
-echo $ECHO_N "checking for crypt in -lc... $ECHO_C" >&6
-if test "${ac_cv_lib_c_crypt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 crypt ();
-int
-main ()
-{
-crypt ();
-  ;
-  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
-  ac_cv_lib_c_crypt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_c_crypt=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_c_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_c_crypt" >&6
-if test $ac_cv_lib_c_crypt = yes; then
-  kde_have_crypt=yes
-else
-
-        { echo "$as_me:$LINENO: WARNING: you have no crypt in either libcrypt or libc.
-You should install libcrypt from another source or configure with PAM
-support" >&5
-echo "$as_me: WARNING: you have no crypt in either libcrypt or libc.
-You should install libcrypt from another source or configure with PAM
-support" >&2;}
-	kde_have_crypt=no
-
-fi
-
-fi
-
-
-   if test $kde_have_crypt = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_CRYPT 1
-_ACEOF
-
-   fi
-
-  echo "$as_me:$LINENO: checking for socklen_t" >&5
-echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6
-  if test "${ac_cv_socklen_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-     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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-    cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int
-main ()
-{
-
-socklen_t a=0;
-getsockname(0,(struct sockaddr*)0, &a);
-
-  ;
-  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
-  ac_cv_socklen_t=socklen_t
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int
-main ()
-{
-
-int a=0;
-getsockname(0,(struct sockaddr*)0, &a);
-
-  ;
-  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
-  ac_cv_socklen_t=int
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_socklen_t=size_t
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-fi
-rm -f 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
-
-
-fi
-
-
-  echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5
-echo "${ECHO_T}$ac_cv_socklen_t" >&6
-  if test "$ac_cv_socklen_t" != "socklen_t"; then
-
-cat >>confdefs.h <<_ACEOF
-#define socklen_t $ac_cv_socklen_t
-_ACEOF
-
-  fi
-
-cat >>confdefs.h <<_ACEOF
-#define ksize_t socklen_t
-_ACEOF
-
-
-
-   echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 dnet_ntoa ();
-int
-main ()
-{
-dnet_ntoa ();
-  ;
-  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
-  ac_cv_lib_dnet_dnet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_dnet_ntoa=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
-if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-fi
-
-   if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldnet_stub  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 dnet_ntoa ();
-int
-main ()
-{
-dnet_ntoa ();
-  ;
-  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
-  ac_cv_lib_dnet_stub_dnet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dnet_stub_dnet_ntoa=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
-if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-fi
-
-   fi
-   echo "$as_me:$LINENO: checking for inet_ntoa" >&5
-echo $ECHO_N "checking for inet_ntoa... $ECHO_C" >&6
-if test "${ac_cv_func_inet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char inet_ntoa (); 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
-/* 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 inet_ntoa ();
-/* 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_inet_ntoa) || defined (__stub___inet_ntoa)
-choke me
-#else
-char (*f) () = inet_ntoa;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != inet_ntoa;
-  ;
-  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
-  ac_cv_func_inet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_inet_ntoa=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_inet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_func_inet_ntoa" >&6
-
-   if test $ac_cv_func_inet_ntoa = no; then
-     echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
-echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
-if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 inet_ntoa ();
-int
-main ()
-{
-inet_ntoa ();
-  ;
-  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
-  ac_cv_lib_nsl_inet_ntoa=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_nsl_inet_ntoa=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
-if test $ac_cv_lib_nsl_inet_ntoa = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-fi
-
-   fi
-   echo "$as_me:$LINENO: checking for connect" >&5
-echo $ECHO_N "checking for connect... $ECHO_C" >&6
-if test "${ac_cv_func_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect (); 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
-/* 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 connect ();
-/* 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_connect) || defined (__stub___connect)
-choke me
-#else
-char (*f) () = connect;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != connect;
-  ;
-  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
-  ac_cv_func_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_connect=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-echo "${ECHO_T}$ac_cv_func_connect" >&6
-
-   if test $ac_cv_func_connect = no; then
-      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-if test "${ac_cv_lib_socket_connect+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 connect ();
-int
-main ()
-{
-connect ();
-  ;
-  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
-  ac_cv_lib_socket_connect=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_socket_connect=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-if test $ac_cv_lib_socket_connect = yes; then
-  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-fi
-
-   fi
-
-   echo "$as_me:$LINENO: checking for remove" >&5
-echo $ECHO_N "checking for remove... $ECHO_C" >&6
-if test "${ac_cv_func_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove (); 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
-/* 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 remove ();
-/* 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_remove) || defined (__stub___remove)
-choke me
-#else
-char (*f) () = remove;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != remove;
-  ;
-  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
-  ac_cv_func_remove=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_remove=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-echo "${ECHO_T}$ac_cv_func_remove" >&6
-
-   if test $ac_cv_func_remove = no; then
-      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
-if test "${ac_cv_lib_posix_remove+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 remove ();
-int
-main ()
-{
-remove ();
-  ;
-  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
-  ac_cv_lib_posix_remove=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_posix_remove=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
-if test $ac_cv_lib_posix_remove = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-fi
-
-   fi
-
-   # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-   echo "$as_me:$LINENO: checking for shmat" >&5
-echo $ECHO_N "checking for shmat... $ECHO_C" >&6
-if test "${ac_cv_func_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat (); 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
-/* 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 shmat ();
-/* 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_shmat) || defined (__stub___shmat)
-choke me
-#else
-char (*f) () = shmat;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shmat;
-  ;
-  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
-  ac_cv_func_shmat=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shmat=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-echo "${ECHO_T}$ac_cv_func_shmat" >&6
-if test $ac_cv_func_shmat = yes; then
-  :
-else
-  echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lipc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 shmat ();
-int
-main ()
-{
-shmat ();
-  ;
-  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
-  ac_cv_lib_ipc_shmat=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ipc_shmat=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
-if test $ac_cv_lib_ipc_shmat = yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-fi
-
-fi
-
-
-   # more headers that need to be explicitly included on darwin
-
-
-for ac_header in sys/types.h stdint.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
-/* #line $LINENO "configure" */
-/* 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
-  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.$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
-/* #line $LINENO "configure" */
-/* 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
-  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 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;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-  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: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_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
-
-
-   # darwin requires a poll emulation library
-   echo "$as_me:$LINENO: checking for poll in -lpoll" >&5
-echo $ECHO_N "checking for poll in -lpoll... $ECHO_C" >&6
-if test "${ac_cv_lib_poll_poll+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpoll  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 poll ();
-int
-main ()
-{
-poll ();
-  ;
-  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
-  ac_cv_lib_poll_poll=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_poll_poll=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_poll_poll" >&5
-echo "${ECHO_T}$ac_cv_lib_poll_poll" >&6
-if test $ac_cv_lib_poll_poll = yes; then
-  LIB_POLL="-lpoll"
-fi
-
-
-   # CoreAudio framework
-   if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
-if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking CoreAudio/CoreAudio.h usability" >&5
-echo $ECHO_N "checking CoreAudio/CoreAudio.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <CoreAudio/CoreAudio.h>
-_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
-  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.$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 CoreAudio/CoreAudio.h presence" >&5
-echo $ECHO_N "checking CoreAudio/CoreAudio.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <CoreAudio/CoreAudio.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
-  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 in
-  yes:no )
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-  no:yes )
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for CoreAudio/CoreAudio.h" >&5
-echo $ECHO_N "checking for CoreAudio/CoreAudio.h... $ECHO_C" >&6
-if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_CoreAudio_CoreAudio_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_CoreAudio_CoreAudio_h" >&5
-echo "${ECHO_T}$ac_cv_header_CoreAudio_CoreAudio_h" >&6
-
-fi
-if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_COREAUDIO 1
-_ACEOF
-
-     FRAMEWORK_COREAUDIO="-Xlinker -framework -Xlinker CoreAudio"
-
-fi
-
-
-
-
-  echo "$as_me:$LINENO: checking if res_init needs -lresolv" >&5
-echo $ECHO_N "checking if res_init needs -lresolv... $ECHO_C" >&6
-  kde_libs_safe="$LIBS"
-  LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
-int
-main ()
-{
-
-      res_init();
-
-  ;
-  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
-
-      LIBRESOLV="-lresolv"
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RES_INIT 1
-_ACEOF
-
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  LIBS=$kde_libs_safe
-
-
-  echo "$as_me:$LINENO: checking if res_init is available" >&5
-echo $ECHO_N "checking if res_init is available... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-
-int
-main ()
-{
-
-      res_init();
-
-  ;
-  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
-
-      echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RES_INIT 1
-_ACEOF
-
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-
-
-   LIBSOCKET="$X_EXTRA_LIBS"
-
-
-   echo "$as_me:$LINENO: checking for killpg in -lucb" >&5
-echo $ECHO_N "checking for killpg in -lucb... $ECHO_C" >&6
-if test "${ac_cv_lib_ucb_killpg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lucb  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 killpg ();
-int
-main ()
-{
-killpg ();
-  ;
-  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
-  ac_cv_lib_ucb_killpg=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ucb_killpg=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_killpg" >&5
-echo "${ECHO_T}$ac_cv_lib_ucb_killpg" >&6
-if test $ac_cv_lib_ucb_killpg = yes; then
-  LIBUCB="-lucb"
-fi
-
-
-   case $host in     *-*-lynxos* )
-        echo "$as_me:$LINENO: checking LynxOS header file wrappers" >&5
-echo $ECHO_N "checking LynxOS header file wrappers... $ECHO_C" >&6
-        CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__"
-        echo "$as_me:$LINENO: result: disabled" >&5
-echo "${ECHO_T}disabled" >&6
-        echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 gethostbyname ();
-int
-main ()
-{
-gethostbyname ();
-  ;
-  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
-  ac_cv_lib_bsd_gethostbyname=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bsd_gethostbyname=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
-if test $ac_cv_lib_bsd_gethostbyname = yes; then
-  LIBSOCKET="-lbsd"
-fi
-          ;;
-    esac
-
-     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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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
-/* #line $LINENO "configure" */
-/* 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>&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.$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.$ac_objext conftest.$ac_ext
-fi
-rm -f 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" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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.* *.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
-
-   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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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
-/* #line $LINENO "configure" */
-/* 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>&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.$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.$ac_objext conftest.$ac_ext
-fi
-rm -f 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" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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.* *.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 long" >&5
-echo $ECHO_N "checking for long... $ECHO_C" >&6
-if test "${ac_cv_type_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long *) 0)
-  return 0;
-if (sizeof (long))
-  return 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
-  ac_cv_type_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-echo "${ECHO_T}$ac_cv_type_long" >&6
-
-echo "$as_me:$LINENO: checking size of long" >&5
-echo $ECHO_N "checking size of long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_long" = 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
-/* #line $LINENO "configure" */
-/* 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 (long))) >= 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>&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
-/* #line $LINENO "configure" */
-/* 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 (long))) <= $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>&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.$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
-/* #line $LINENO "configure" */
-/* 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 (long))) < 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>&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
-/* #line $LINENO "configure" */
-/* 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 (long))) >= $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>&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.$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.$ac_objext conftest.$ac_ext
-fi
-rm -f 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" */
-/* 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 (long))) <= $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>&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.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 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
-/* #line $LINENO "configure" */
-/* 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 (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (long))))
-	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_long=`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 (long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core 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_long=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-_ACEOF
-
-  echo "$as_me:$LINENO: checking for char *" >&5
-echo $ECHO_N "checking for char *... $ECHO_C" >&6
-if test "${ac_cv_type_char_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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>&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_p=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_char_p=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_char_p" >&5
-echo "${ECHO_T}$ac_cv_type_char_p" >&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_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_char_p" = 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
-/* #line $LINENO "configure" */
-/* 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>&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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-/* #line $LINENO "configure" */
-/* 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>&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
-/* #line $LINENO "configure" */
-/* 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>&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.$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.$ac_objext conftest.$ac_ext
-fi
-rm -f 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" */
-/* 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>&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.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_char_p=$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
-/* #line $LINENO "configure" */
-/* 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_p=`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.* *.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_p=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
-echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_CHAR_P $ac_cv_sizeof_char_p
-_ACEOF
-
-
-
-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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-
-LIBDL="-ldl"
-ac_cv_have_dlfcn=yes
-
-fi
-
-
-echo "$as_me:$LINENO: checking for shl_unload in -ldld" >&5
-echo $ECHO_N "checking for shl_unload in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_unload+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
-/* #line $LINENO "configure" */
-/* 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_unload ();
-int
-main ()
-{
-shl_unload ();
-  ;
-  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
-  ac_cv_lib_dld_shl_unload=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_unload=no
-fi
-rm -f 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_unload" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_unload" >&6
-if test $ac_cv_lib_dld_shl_unload = yes; then
-
-LIBDL="-ldld"
-ac_cv_have_shload=yes
-
-fi
-
-
-
-
-
-
-
-  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
-/* #line $LINENO "configure" */
-/* 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>&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.$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
-
-echo "$as_me:$LINENO: checking size of size_t" >&5
-echo $ECHO_N "checking size of size_t... $ECHO_C" >&6
-if test "${ac_cv_sizeof_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_size_t" = 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
-/* #line $LINENO "configure" */
-/* 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 (size_t))) >= 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>&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
-/* #line $LINENO "configure" */
-/* 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 (size_t))) <= $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>&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.$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
-/* #line $LINENO "configure" */
-/* 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 (size_t))) < 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>&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
-/* #line $LINENO "configure" */
-/* 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 (size_t))) >= $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>&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.$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.$ac_objext conftest.$ac_ext
-fi
-rm -f 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" */
-/* 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 (size_t))) <= $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>&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.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_size_t=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 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
-/* #line $LINENO "configure" */
-/* 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 (size_t)); }
-unsigned long ulongval () { return (long) (sizeof (size_t)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (size_t))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (size_t))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (size_t))))
-	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_size_t=`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 (size_t), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (size_t), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core 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_size_t=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-_ACEOF
-
-
-  echo "$as_me:$LINENO: checking for unsigned long" >&5
-echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6
-if test "${ac_cv_type_unsigned_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((unsigned long *) 0)
-  return 0;
-if (sizeof (unsigned long))
-  return 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
-  ac_cv_type_unsigned_long=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_unsigned_long=no
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6
-
-echo "$as_me:$LINENO: checking size of unsigned long" >&5
-echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6
-if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$ac_cv_type_unsigned_long" = 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
-/* #line $LINENO "configure" */
-/* 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 (unsigned long))) >= 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>&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
-/* #line $LINENO "configure" */
-/* 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 (unsigned long))) <= $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>&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.$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
-/* #line $LINENO "configure" */
-/* 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 (unsigned long))) < 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>&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
-/* #line $LINENO "configure" */
-/* 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 (unsigned long))) >= $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>&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.$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.$ac_objext conftest.$ac_ext
-fi
-rm -f 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" */
-/* 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 (unsigned long))) <= $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>&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.$ac_objext conftest.$ac_ext
-done
-case $ac_lo in
-?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 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
-/* #line $LINENO "configure" */
-/* 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 (unsigned long)); }
-unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-  FILE *f = fopen ("conftest.val", "w");
-  if (! f)
-    exit (1);
-  if (((long) (sizeof (unsigned long))) < 0)
-    {
-      long i = longval ();
-      if (i != ((long) (sizeof (unsigned long))))
-	exit (1);
-      fprintf (f, "%ld\n", i);
-    }
-  else
-    {
-      unsigned long i = ulongval ();
-      if (i != ((long) (sizeof (unsigned long))))
-	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_unsigned_long=`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 (unsigned long), 77
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (unsigned long), 77
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-rm -f core 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_unsigned_long=0
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
-_ACEOF
-
-
-
-  echo "$as_me:$LINENO: checking sizeof size_t == sizeof unsigned long" >&5
-echo $ECHO_N "checking sizeof size_t == sizeof unsigned long... $ECHO_C" >&6
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-    #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_LONG
-       choke me
-    #endif
-
-  ;
-  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
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-      echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-      { { echo "$as_me:$LINENO: error:
-       Apparently on your system our assumption sizeof size_t == sizeof unsigned long
-       does not apply. Please mail kde-devel@kde.org with a description of your system!
-      " >&5
-echo "$as_me: error:
-       Apparently on your system our assumption sizeof size_t == sizeof unsigned long
-       does not apply. Please mail kde-devel@kde.org with a description of your system!
-      " >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-
-# darwin needs this to initialize the environment
-
-for ac_header in crt_externs.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
-/* #line $LINENO "configure" */
-/* 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
-  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.$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
-/* #line $LINENO "configure" */
-/* 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
-  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 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;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-  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: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_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
-
-echo "$as_me:$LINENO: checking for _NSGetEnviron" >&5
-echo $ECHO_N "checking for _NSGetEnviron... $ECHO_C" >&6
-if test "${ac_cv_func__NSGetEnviron+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _NSGetEnviron (); 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
-/* 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 _NSGetEnviron ();
-/* 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__NSGetEnviron) || defined (__stub____NSGetEnviron)
-choke me
-#else
-char (*f) () = _NSGetEnviron;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != _NSGetEnviron;
-  ;
-  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
-  ac_cv_func__NSGetEnviron=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func__NSGetEnviron=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func__NSGetEnviron" >&5
-echo "${ECHO_T}$ac_cv_func__NSGetEnviron" >&6
-if test $ac_cv_func__NSGetEnviron = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NSGETENVIRON 1
-_ACEOF
-
-fi
-
-
-
-
-
-
-
-
-
-
-for ac_func in vsnprintf snprintf
-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
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* 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
-/* 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>&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.$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
-
-
-
-
-
-
-
-
-
-# Check whether --enable-embedded or --disable-embedded was given.
-if test "${enable_embedded+set}" = set; then
-  enableval="$enable_embedded"
-  kde_use_qt_emb=$enableval
-else
-  kde_use_qt_emb=no
-
-fi;
-
-# Check whether --enable-qtopia or --disable-qtopia was given.
-if test "${enable_qtopia+set}" = set; then
-  enableval="$enable_qtopia"
-  kde_use_qt_emb_palm=$enableval
-else
-  kde_use_qt_emb_palm=no
-
-fi;
-
-# Check whether --enable-mac or --disable-mac was given.
-if test "${enable_mac+set}" = set; then
-  enableval="$enable_mac"
-  kde_use_qt_mac=$enableval
-else
-  kde_use_qt_mac=no
-
-fi;
-
-if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
-
-echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
-
-if test "${kde_cv_have_x+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # One or both of the vars are not set, and there is no cached value.
-if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then
-   kde_x_includes=NO
-else
-   kde_x_includes=$x_includes
-fi
-if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then
-   kde_x_libraries=NO
-else
-   kde_x_libraries=$x_libraries
-fi
-
-# below we use the standard autoconf calls
-ac_x_libraries=$kde_x_libraries
-ac_x_includes=$kde_x_includes
-
-
-
-
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-
-  # First, try using that file with no special directory specified.
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$x_direct_test_include>
-_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
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done
-fi
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = NO
-
-if test "$ac_x_libraries" = NO; then
-  # Check for the libraries.
-
-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS="$LIBS"
-  LIBS="-l$x_direct_test_library $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-${x_direct_test_function}()
-  ;
-  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
-  LIBS="$ac_save_LIBS"
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-    /usr/X11/lib${kdelibsuff}           \
-    /usr/X11R6/lib${kdelibsuff}         \
-    /usr/X11R5/lib${kdelibsuff}         \
-    /usr/X11R4/lib${kdelibsuff}         \
-                                        \
-    /usr/lib${kdelibsuff}/X11           \
-    /usr/lib${kdelibsuff}/X11R6         \
-    /usr/lib${kdelibsuff}/X11R5         \
-    /usr/lib${kdelibsuff}/X11R4         \
-                                        \
-    /usr/local/X11/lib${kdelibsuff}     \
-    /usr/local/X11R6/lib${kdelibsuff}   \
-    /usr/local/X11R5/lib${kdelibsuff}   \
-    /usr/local/X11R4/lib${kdelibsuff}   \
-                                        \
-    /usr/local/lib${kdelibsuff}/X11     \
-    /usr/local/lib${kdelibsuff}/X11R6   \
-    /usr/local/lib${kdelibsuff}/X11R5   \
-    /usr/local/lib${kdelibsuff}/X11R4   \
-                                        \
-    /usr/X386/lib${kdelibsuff}          \
-    /usr/x386/lib${kdelibsuff}          \
-    /usr/XFree86/lib${kdelibsuff}/X11   \
-                                        \
-    /usr/lib${kdelibsuff}               \
-    /usr/local/lib${kdelibsuff}         \
-    /usr/unsupported/lib${kdelibsuff}   \
-    /usr/athena/lib${kdelibsuff}        \
-    /usr/local/x11r5/lib${kdelibsuff}   \
-    /usr/lpp/Xamples/lib${kdelibsuff}   \
-    /lib/usr/lib${kdelibsuff}/X11       \
-                                        \
-    /usr/openwin/lib${kdelibsuff}       \
-    /usr/openwin/share/lib${kdelibsuff} \
-    ; \
-do
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = NO
-
-case "$host" in
-mips-sgi-irix6*)
-  ;;
-*-*-solaris*)
-  ;;
-*)
-  rm -fr conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-  cat >Imakefile <<'_ACEOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-_ACEOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-         test -f $ac_im_libdir/libX11.$ac_extension; then
-        ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case $ac_im_incroot in
-	/usr/include) ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -fr conftest.dir
-fi
-
-  if test -z "$ac_x_includes"; then
-    ac_x_includes="."
-  fi
-  if test -z "$ac_x_libraries"; then
-    ac_x_libraries="/usr/lib${kdelibsuff}"
-  fi
-esac
-#from now on we use our own again
-
-# when the user already gave --x-includes, we ignore
-# what the standard autoconf macros told us.
-if test "$kde_x_includes" = NO; then
-  kde_x_includes=$ac_x_includes
-fi
-
-# for --x-libraries too
-if test "$kde_x_libraries" = NO; then
-  kde_x_libraries=$ac_x_libraries
-fi
-
-if test "$kde_x_includes" = NO; then
-  { { echo "$as_me:$LINENO: error: Can't find X includes. Please check your installation and add the correct paths!" >&5
-echo "$as_me: error: Can't find X includes. Please check your installation and add the correct paths!" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-if test "$kde_x_libraries" = NO; then
-  { { echo "$as_me:$LINENO: error: Can't find X libraries. Please check your installation and add the correct paths!" >&5
-echo "$as_me: error: Can't find X libraries. Please check your installation and add the correct paths!" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# Record where we found X for the cache.
-kde_cv_have_x="have_x=yes \
-         kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries"
-
-fi
-
-eval "$kde_cv_have_x"
-
-if test "$have_x" != yes; then
-  echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
-  no_x=yes
-else
-  echo "$as_me:$LINENO: result: libraries $kde_x_libraries, headers $kde_x_includes" >&5
-echo "${ECHO_T}libraries $kde_x_libraries, headers $kde_x_includes" >&6
-fi
-
-if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-  X_INCLUDES=""
-  x_includes=".";  else
-  x_includes=$kde_x_includes
-  X_INCLUDES="-I$x_includes"
-fi
-
-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
-  X_LDFLAGS=""
-  x_libraries="/usr/lib";  else
-  x_libraries=$kde_x_libraries
-  X_LDFLAGS="-L$x_libraries"
-fi
-all_includes="$X_INCLUDES"
-all_libraries="$X_LDFLAGS"
-
-# Check for libraries that X11R6 Xt/Xaw programs need.
-ac_save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-# check for ICE first), but we must link in the order -lSM -lICE or
-# we get undefined symbols.  So assume we have SM if we have ICE.
-# These have to be linked with before -lX11, unlike the other
-# libraries we check for below, so use a different variable.
-#  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 IceConnectionNumber ();
-int
-main ()
-{
-IceConnectionNumber ();
-  ;
-  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
-  ac_cv_lib_ICE_IceConnectionNumber=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_ICE_IceConnectionNumber=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
-if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-  LIBSM="-lSM -lICE"
-fi
-
-LDFLAGS="$ac_save_LDFLAGS"
-
-LIB_X11='-lX11 $(LIBSOCKET)'
-
-echo "$as_me:$LINENO: checking for libXext" >&5
-echo $ECHO_N "checking for libXext... $ECHO_C" >&6
-if test "${kde_cv_have_libXext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-kde_ldflags_safe="$LDFLAGS"
-kde_libs_safe="$LIBS"
-
-LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS"
-LIBS="-lXext -lX11 $LIBSOCKET"
-
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <stdio.h>
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-
-int
-main ()
-{
-
-printf("hello Xext\n");
-
-  ;
-  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
-  kde_cv_have_libXext=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-kde_cv_have_libXext=no
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-
-LDFLAGS=$kde_ldflags_safe
-LIBS=$kde_libs_safe
-
-fi
-
-
-echo "$as_me:$LINENO: result: $kde_cv_have_libXext" >&5
-echo "${ECHO_T}$kde_cv_have_libXext" >&6
-
-if test "$kde_cv_have_libXext" = "no"; then
-  { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either." >&5
-echo "$as_me: error: We need a working libXext to proceed. Since configure
-can't find it itself, we stop here assuming that make wouldn't find
-them either." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-LIB_XEXT="-lXext"
-QTE_NORTTI=""
-
-elif test "$kde_use_qt_emb" = "yes"; then
-    CPPFLAGS=-DQWS
-  CXXFLAGS="$CXXFLAGS -fno-rtti"
-  QTE_NORTTI="-fno-rtti -DQWS"
-  X_PRE_LIBS=""
-  LIB_X11=""
-  LIB_XEXT=""
-  LIB_XRENDER=""
-  LIBSM=""
-  X_INCLUDES=""
-  X_LDFLAGS=""
-  x_includes=""
-  x_libraries=""
-elif test "$kde_use_qt_mac" = "yes"; then
-      CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
-  CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
-  X_PRE_LIBS=""
-  LIB_X11=""
-  LIB_XEXT=""
-  LIB_XRENDER=""
-  LIBSM=""
-  X_INCLUDES=""
-  X_LDFLAGS=""
-  x_includes=""
-  x_libraries=""
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-  LIBPTHREAD=""
-
-  if test -n "$PTHREAD_LIBS"; then
-    PTHREAD_LIBS_save="$PTHREAD_LIBS"
-    PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
-
-     kde_save_LDFLAGS="$LDFLAGS"
-          kde_save_LIBS="$LIBS"
-     LDFLAGS="$LDFLAGS $all_libraries"
-     case $host_os in
-      aix*) LDFLAGS="-brtl $LDFLAGS"
-	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-	;;
-     esac
-     as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-l$PTHREAD_LIBS  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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 pthread_create ();
-int
-main ()
-{
-pthread_create ();
-  ;
-  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
-  eval "$as_ac_Lib=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Lib=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
-  LIBPTHREAD="$PTHREAD_LIBS_save"
-fi
-
-     LDFLAGS="$kde_save_LDFLAGS"
-     LIBS="$kde_save_LIBS"
-
-    PTHREAD_LIBS="$PTHREAD_LIBS_save"
-  fi
-
-  if test -z "$LIBPTHREAD"; then
-    echo "$as_me:$LINENO: 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 $LINENO "configure" */
-/* 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 pthread_create ();
-int
-main ()
-{
-pthread_create ();
-  ;
-  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
-  ac_cv_lib_pthread_pthread_create=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' 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:$LINENO: 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
-  LIBPTHREAD="-lpthread"
-fi
-
-  fi
-
-
-
-
-      USE_THREADS=""
-      if test -z "$LIBPTHREAD"; then
-
-echo "$as_me:$LINENO: checking whether $CXX supports -pthread" >&5
-echo $ECHO_N "checking whether $CXX supports -pthread... $ECHO_C" >&6
-kde_cache=`echo pthread | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -pthread"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- USE_THREADS="-D_THREAD_SAFE -pthread"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-      fi
-
-
-
-    case $host_os in
- 	solaris*)
-
-echo "$as_me:$LINENO: checking whether $CXX supports -mt" >&5
-echo $ECHO_N "checking whether $CXX supports -mt... $ECHO_C" >&6
-kde_cache=`echo mt | sed 'y% .=/+-,%____p__%'`
-if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
-   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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-  save_CXXFLAGS="$CXXFLAGS"
-  CXXFLAGS="$CXXFLAGS -mt"
-  cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
- return 0;
-  ;
-  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
-  eval "kde_cv_prog_cxx_$kde_cache=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-  CXXFLAGS="$save_CXXFLAGS"
-  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
-
-if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- :
- USE_THREADS="-mt"
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- :
-
-fi
-
-                CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_SOLARIS -DSVR4"
-    		;;
-        freebsd*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE $PTHREAD_CFLAGS"
-                ;;
-        aix*)
-                CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
-                LIBPTHREAD="$LIBPTHREAD -lc_r"
-                ;;
-        linux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-                if test "$CXX" = "KCC"; then
-                  CXXFLAGS="$CXXFLAGS --thread_safe"
-		  NOOPT_CXXFLAGS="$NOOPT_CXXFLAGS --thread_safe"
-                fi
-                ;;
-	*)
-		;;
-    esac
-
-
-
-
-echo "$as_me:$LINENO: checking for extra includes" >&5
-echo $ECHO_N "checking for extra includes... $ECHO_C" >&6
-
-# Check whether --with-extra-includes or --without-extra-includes was given.
-if test "${with_extra_includes+set}" = set; then
-  withval="$with_extra_includes"
-  kde_use_extra_includes="$withval"
-else
-  kde_use_extra_includes=NONE
-
-fi;
-kde_extra_includes=
-if test -n "$kde_use_extra_includes" && \
-   test "$kde_use_extra_includes" != "NONE"; then
-
-   ac_save_ifs=$IFS
-   IFS=':'
-   for dir in $kde_use_extra_includes; do
-     kde_extra_includes="$kde_extra_includes $dir"
-     USER_INCLUDES="$USER_INCLUDES -I$dir"
-   done
-   IFS=$ac_save_ifs
-   kde_use_extra_includes="added"
-else
-   kde_use_extra_includes="no"
-fi
-
-
-echo "$as_me:$LINENO: result: $kde_use_extra_includes" >&5
-echo "${ECHO_T}$kde_use_extra_includes" >&6
-
-kde_extra_libs=
-echo "$as_me:$LINENO: checking for extra libs" >&5
-echo $ECHO_N "checking for extra libs... $ECHO_C" >&6
-
-# Check whether --with-extra-libs or --without-extra-libs was given.
-if test "${with_extra_libs+set}" = set; then
-  withval="$with_extra_libs"
-  kde_use_extra_libs=$withval
-else
-  kde_use_extra_libs=NONE
-
-fi;
-if test -n "$kde_use_extra_libs" && \
-   test "$kde_use_extra_libs" != "NONE"; then
-
-   ac_save_ifs=$IFS
-   IFS=':'
-   for dir in $kde_use_extra_libs; do
-     kde_extra_libs="$kde_extra_libs $dir"
-     KDE_EXTRA_RPATH="$KDE_EXTRA_RPATH -R $dir"
-     USER_LDFLAGS="$USER_LDFLAGS -L$dir"
-   done
-   IFS=$ac_save_ifs
-   kde_use_extra_libs="added"
-else
-   kde_use_extra_libs="no"
-fi
-
-
-
-echo "$as_me:$LINENO: result: $kde_use_extra_libs" >&5
-echo "${ECHO_T}$kde_use_extra_libs" >&6
-
-
-
-
-echo "$as_me:$LINENO: checking for libz" >&5
-echo $ECHO_N "checking for libz... $ECHO_C" >&6
-if test "${ac_cv_lib_z+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-kde_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -lz $LIBSOCKET"
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include<zlib.h>
-
-int
-main ()
-{
-
-  char buf[42];
-  gzFile f = (gzFile) 0;
-  /* this would segfault.. but we only link, don't run */
-  (void) gzgets(f, buf, sizeof(buf));
-
-  return (zlibVersion() == ZLIB_VERSION);
-
-  ;
-  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
-  eval "ac_cv_lib_z='-lz'"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_z=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-
-fi
-if test ! "$ac_cv_lib_z" = no; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
-  LIBZ="$ac_cv_lib_z"
-  echo "$as_me:$LINENO: result: $ac_cv_lib_z" >&5
-echo "${ECHO_T}$ac_cv_lib_z" >&6
-else
-  { { echo "$as_me:$LINENO: error: not found.
-          Possibly configure picks up an outdated version
-          installed by XFree86. Remove it from your system.
-
-          Check your installation and look into config.log" >&5
-echo "$as_me: error: not found.
-          Possibly configure picks up an outdated version
-          installed by XFree86. Remove it from your system.
-
-          Check your installation and look into config.log" >&2;}
-   { (exit 1); exit 1; }; }
-  LIBZ=""
-fi
-
-
-
-
-
-echo "$as_me:$LINENO: checking for libpng" >&5
-echo $ECHO_N "checking for libpng... $ECHO_C" >&6
-if test "${ac_cv_lib_png+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-kde_save_LIBS="$LIBS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm -lX11 $LIBSOCKET"
-else
-LIBS="$LIBS $all_libraries $USER_LDFLAGS -lpng $LIBZ -lm"
-fi
-kde_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-    #include<png.h>
-
-int
-main ()
-{
-
-    png_structp png_ptr = png_create_read_struct(  /* image ptr */
-		PNG_LIBPNG_VER_STRING, 0, 0, 0 );
-    return( png_ptr != 0 );
-
-  ;
-  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
-  eval "ac_cv_lib_png='-lpng $LIBZ -lm'"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_png=no"
-
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS="$kde_save_LIBS"
-CFLAGS="$kde_save_CFLAGS"
-
-fi
-if eval "test ! \"`echo $ac_cv_lib_png`\" = no"; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPNG 1
-_ACEOF
-
-  LIBPNG="$ac_cv_lib_png"
-
-  echo "$as_me:$LINENO: result: $ac_cv_lib_png" >&5
-echo "${ECHO_T}$ac_cv_lib_png" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-  LIBPNG=""
-
-fi
-
-
-
-echo "$as_me:$LINENO: checking for libjpeg6b" >&5
-echo $ECHO_N "checking for libjpeg6b... $ECHO_C" >&6
-if test "${ac_cv_lib_jpeg_6b+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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.  */
-struct jpeg_decompress_struct;
-typedef struct jpeg_decompress_struct * j_decompress_ptr;
-typedef int size_t;
-#ifdef __cplusplus
-extern "C" {
-#endif
-    void jpeg_CreateDecompress(j_decompress_ptr cinfo,
-                                    int version, size_t structsize);
-#ifdef __cplusplus
-}
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-
-int
-main ()
-{
-jpeg_CreateDecompress(0L, 0, 0);
-  ;
-  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
-  eval "ac_cv_lib_jpeg_6b=-ljpeg6b"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_jpeg_6b=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS="$ac_save_LIBS"
-CFLAGS="$ac_save_CFLAGS"
-
-fi
-
-
-if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
-  LIBJPEG="$ac_cv_lib_jpeg_6b"
-  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_6b" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_6b" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-echo "$as_me:$LINENO: checking for libjpeg" >&5
-echo $ECHO_N "checking for libjpeg... $ECHO_C" >&6
-if test "${ac_cv_lib_jpeg_normal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* 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.  */
-struct jpeg_decompress_struct;
-typedef struct jpeg_decompress_struct * j_decompress_ptr;
-typedef int size_t;
-#ifdef __cplusplus
-extern "C" {
-#endif
-    void jpeg_CreateDecompress(j_decompress_ptr cinfo,
-                                    int version, size_t structsize);
-#ifdef __cplusplus
-}
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-
-int
-main ()
-{
-jpeg_CreateDecompress(0L, 0, 0);
-  ;
-  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
-  eval "ac_cv_lib_jpeg_normal=-ljpeg"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "ac_cv_lib_jpeg_normal=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS="$ac_save_LIBS"
-CFLAGS="$ac_save_CFLAGS"
-
-fi
-
-
-if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
-  LIBJPEG="$ac_cv_lib_jpeg_normal"
-  echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_normal" >&5
-echo "${ECHO_T}$ac_cv_lib_jpeg_normal" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-       LIBJPEG=
-
-
-fi
-
-
-
-fi
-
-
-
-jpeg_incdirs="$includedir /usr/include /usr/local/include $kde_extra_includes"
-
-jpeg_incdir=NO
-for i in $jpeg_incdirs;
-do
-  for j in jpeglib.h;
-  do
-    echo "configure: 26606: $i/$j" >&5
-    if test -r "$i/$j"; then
-      echo "taking that" >&5
-      jpeg_incdir=$i
-      break 2
-    fi
-  done
-done
-
-test "x$jpeg_incdir" = xNO && jpeg_incdir=
-
-if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBJPEG 1
-_ACEOF
-
-else
-  if test -n "$jpeg_incdir" || test -n "$LIBJPEG" ; then
-    { echo "$as_me:$LINENO: WARNING:
-There is an installation error in jpeg support. You seem to have only one
-of either the headers _or_ the libraries installed. You may need to either
-provide correct --with-extra-... options, or the development package of
-libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-Disabling JPEG support.
-" >&5
-echo "$as_me: WARNING:
-There is an installation error in jpeg support. You seem to have only one
-of either the headers _or_ the libraries installed. You may need to either
-provide correct --with-extra-... options, or the development package of
-libjpeg6b. You can get a source package of libjpeg from http://www.ijg.org/
-Disabling JPEG support.
-" >&2;}
-  else
-    { echo "$as_me:$LINENO: WARNING: libjpeg not found. disable JPEG support." >&5
-echo "$as_me: WARNING: libjpeg not found. disable JPEG support." >&2;}
-  fi
-  jpeg_incdir=
-  LIBJPEG=
-fi
-
-
-
-
-
-
-
-   echo "$as_me:$LINENO: checking for perl" >&5
-echo $ECHO_N "checking for perl... $ECHO_C" >&6
-   if test -n "$PERL"; then
-        kde_cv_path="$PERL";
-   else
-        kde_cache=`echo perl | sed 'y%./+-%__p_%'`
-
-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        kde_cv_path="NONE"
-	dirs="$bindir $exec_prefix/bin $prefix/bin"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/perl"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/perl  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/perl"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/perl"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-
-		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
-We need perl to generate some code." >&5
-echo "$as_me: error: No Perl found in your $PATH.
-We need perl to generate some code." >&2;}
-   { (exit 1); exit 1; }; }
-
-   else
-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-      PERL=$kde_cv_path
-
-   fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --enable-mt or --disable-mt was given.
-if test "${enable_mt+set}" = set; then
-  enableval="$enable_mt"
-  kde_use_qt_mt=$enableval
-else
-
-    if test $kde_qtver = 3; then
-      kde_use_qt_mt=yes
-    else
-      kde_use_qt_mt=no
-    fi
-
-
-fi;
-
-USING_QT_MT=""
-
-
-KDE_MT_LDFLAGS=
-KDE_MT_LIBS=
-if test "x$kde_use_qt_mt" = "xyes"; then
-
-
-
-    if test -z "$LIBPTHREAD"; then
-    if test -z "$USE_THREADS"; then
-      kde_check_threading_default=no
-    else
-      kde_check_threading_default=yes
-    fi
-  else
-    kde_check_threading_default=yes
-  fi
-  # Check whether --enable-threading or --disable-threading was given.
-if test "${enable_threading+set}" = set; then
-  enableval="$enable_threading"
-  kde_use_threading=$enableval
-else
-  kde_use_threading=$kde_check_threading_default
-fi;
-  if test "x$kde_use_threading" = "xyes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
-
-  fi
-
-  if test "x$kde_use_threading" = "xyes"; then
-    CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS"
-    KDE_MT_LDFLAGS="$USE_THREADS"
-    KDE_MT_LIBS="$LIBPTHREAD"
-  else
-    kde_use_qt_mt=no
-  fi
-fi
-
-
-
-kde_qt_was_given=yes
-
-if test -z "$LIBQT_GLOB"; then
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    LIBQT_GLOB="libqte.*"
-  else
-    LIBQT_GLOB="libqt.*"
-  fi
-fi
-
-if test -z "$LIBQT"; then
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    qtlib="qte"
-  else
-    qtlib="qt"
-  fi
-
-  kde_int_qt="-l$qtlib"
-else
-  kde_int_qt="$LIBQT"
-  kde_lib_qt_set=yes
-fi
-
-if test -z "$LIBQPE"; then
-  if test "x$kde_use_qt_emb" = "xyes"; then
-    if test "x$kde_use_qt_emb_palm" = "xyes"; then
-      LIB_QPE="-lqpe"
-    else
-      LIB_QPE=""
-    fi
-  else
-    LIB_QPE=""
-  fi
-fi
-
-
-if test "x$kde_use_qt_mt" = "xyes"; then
-  if test -z "$LIBQT"; then
-    LIBQT="-l$qtlib-mt"
-    kde_int_qt="-l$qtlib-mt"
-  else
-    LIBQT="$qtlib-mt"
-    kde_int_qt="$qtlib-mt"
-  fi
-  LIBQT_GLOB="lib$qtlib-mt.*"
-  USING_QT_MT="using -mt"
-else
-  LIBQT="-l$qtlib"
-fi
-
-if test $kde_qtver != 1; then
-
-
-
-  LIBQT="$LIBQT $LIBPNG $LIBJPEG"
-fi
-
-if test $kde_qtver = 3; then
-
-  LIBQT="$LIBQT $LIBDL"
-fi
-
-echo "$as_me:$LINENO: checking for Qt" >&5
-echo $ECHO_N "checking for Qt... $ECHO_C" >&6
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-fi
-ac_qt_includes=NO ac_qt_libraries=NO ac_qt_bindir=NO
-qt_libraries=""
-qt_includes=""
-
-# Check whether --with-qt-dir or --without-qt-dir was given.
-if test "${with_qt_dir+set}" = set; then
-  withval="$with_qt_dir"
-    ac_qt_includes="$withval"/include
-       ac_qt_libraries="$withval"/lib${kdelibsuff}
-       ac_qt_bindir="$withval"/bin
-
-fi;
-
-
-# Check whether --with-qt-includes or --without-qt-includes was given.
-if test "${with_qt_includes+set}" = set; then
-  withval="$with_qt_includes"
-
-       ac_qt_includes="$withval"
-
-fi;
-
-kde_qt_libs_given=no
-
-
-# Check whether --with-qt-libraries or --without-qt-libraries was given.
-if test "${with_qt_libraries+set}" = set; then
-  withval="$with_qt_libraries"
-    ac_qt_libraries="$withval"
-       kde_qt_libs_given=yes
-
-fi;
-
-if test "${ac_cv_have_qt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  #try to guess Qt locations
-
-qt_incdirs=""
-for dir in $kde_qt_dirs; do
-   qt_incdirs="$qt_incdirs $dir/include $dir"
-done
-qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/X11R6/include/qt2 /usr/include/qt3 $x_includes"
-if test ! "$ac_qt_includes" = "NO"; then
-   qt_incdirs="$ac_qt_includes $qt_incdirs"
-fi
-
-if test "$kde_qtver" != "1"; then
-  kde_qt_header=qstyle.h
-else
-  kde_qt_header=qglobal.h
-fi
-
-
-qt_incdir=NO
-for i in $qt_incdirs;
-do
-  for j in $kde_qt_header;
-  do
-    echo "configure: 26911: $i/$j" >&5
-    if test -r "$i/$j"; then
-      echo "taking that" >&5
-      qt_incdir=$i
-      break 2
-    fi
-  done
-done
-
-ac_qt_includes="$qt_incdir"
-
-qt_libdirs=""
-for dir in $kde_qt_dirs; do
-   qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir"
-done
-qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
-if test ! "$ac_qt_libraries" = "NO"; then
-  qt_libdir=$ac_qt_libraries
-else
-  qt_libdirs="$ac_qt_libraries $qt_libdirs"
-  # if the Qt was given, the chance is too big that libqt.* doesn't exist
-  qt_libdir=NONE
-  for dir in $qt_libdirs; do
-    try="ls -1 $dir/${LIBQT_GLOB}"
-    if test -n "`$try 2> /dev/null`"; then qt_libdir=$dir; break; else echo "tried $dir" >&5 ; fi
-  done
-fi
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-  if test -e "$a"; then
-    LIBQT="$LIBQT ${kde_int_qt}_incremental"
-    break
-  fi
-done
-
-ac_qt_libraries="$qt_libdir"
-
-
-
- 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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
-LDFLAGS="$LDFLAGS -L$qt_libdir $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS"
-LIBS="$LIBS $LIBQT $KDE_MT_LIBS"
-
-
-
-cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qglobal.h>
-#include <qapplication.h>
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
-EOF
-
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
-#error 1
-#endif
-EOF
-fi
-fi
-
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qcursor.h>
-#include <qstylefactory.h>
-#include <private/qucomextra_p.h>
-EOF
-fi
-
-echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-cat >> conftest.$ac_ext <<EOF
-#error 1
-#endif
-
-int main() {
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-    QStringList *t = new QStringList();
-    Q_UNUSED(t);
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-    QString s;
-    s.setLatin1("Elvis is alive", 14);
-EOF
-fi
-fi
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-    (void)QStyleFactory::create(QString::null);
-    QCursor c(Qt::WhatsThisCursor);
-EOF
-fi
-cat >> conftest.$ac_ext <<EOF
-    return 0;
-}
-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; then
-  rm -f conftest*
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_qt_libraries="NO"
-fi
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-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 "$ac_qt_includes" = NO || test "$ac_qt_libraries" = NO; then
-  ac_cv_have_qt="have_qt=no"
-  ac_qt_notfound=""
-  missing_qt_mt=""
-  if test "$ac_qt_includes" = NO; then
-    if test "$ac_qt_libraries" = NO; then
-      ac_qt_notfound="(headers and libraries)";
-    else
-      ac_qt_notfound="(headers)";
-    fi
-  else
-    if test "x$kde_use_qt_mt" = "xyes"; then
-       missing_qt_mt="
-Make sure that you have compiled Qt with thread support!"
-       ac_qt_notfound="(library $qtlib-mt)";
-    else
-       ac_qt_notfound="(library $qtlib)";
-    fi
-  fi
-
-  { { echo "$as_me:$LINENO: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-For more details about this problem, look at the end of config.log.$missing_qt_mt" >&5
-echo "$as_me: error: Qt ($kde_qt_minversion) $ac_qt_notfound not found. Please check your installation!
-For more details about this problem, look at the end of config.log.$missing_qt_mt" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  have_qt="yes"
-fi
-
-fi
-
-
-eval "$ac_cv_have_qt"
-
-if test "$have_qt" != yes; then
-  echo "$as_me:$LINENO: result: $have_qt" >&5
-echo "${ECHO_T}$have_qt" >&6;
-else
-  ac_cv_have_qt="have_qt=yes \
-    ac_qt_includes=$ac_qt_includes ac_qt_libraries=$ac_qt_libraries"
-  echo "$as_me:$LINENO: result: libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&5
-echo "${ECHO_T}libraries $ac_qt_libraries, headers $ac_qt_includes $USING_QT_MT" >&6
-
-  qt_libraries="$ac_qt_libraries"
-  qt_includes="$ac_qt_includes"
-fi
-
-if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
-
-
-echo "$as_me:$LINENO: checking if Qt compiles without flags" >&5
-echo $ECHO_N "checking if Qt compiles without flags... $ECHO_C" >&6
-if test "${kde_cv_qt_direct+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
- 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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$qt_includes"
-LDFLAGS="$LDFLAGS $X_LDFLAGS"
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIBS="$LIBQT -lXext -lX11 $LIBSOCKET"
-else
-LIBS="$LIBQT $LIBSOCKET"
-fi
-LD_LIBRARY_PATH=
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-
-
-cat > conftest.$ac_ext <<EOF
-#include "confdefs.h"
-#include <qglobal.h>
-#include <qapplication.h>
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qevent.h>
-#include <qstring.h>
-#include <qstyle.h>
-EOF
-
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-#if QT_VERSION < 210
-#error 1
-#endif
-EOF
-fi
-fi
-
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-#include <qcursor.h>
-#include <qstylefactory.h>
-#include <private/qucomextra_p.h>
-EOF
-fi
-
-echo "#if ! ($kde_qt_verstring)" >> conftest.$ac_ext
-cat >> conftest.$ac_ext <<EOF
-#error 1
-#endif
-
-int main() {
-EOF
-if test "$kde_qtver" = "2"; then
-cat >> conftest.$ac_ext <<EOF
-    QStringList *t = new QStringList();
-    Q_UNUSED(t);
-EOF
-if test $kde_qtsubver -gt 0; then
-cat >> conftest.$ac_ext <<EOF
-    QString s;
-    s.setLatin1("Elvis is alive", 14);
-EOF
-fi
-fi
-if test "$kde_qtver" = "3"; then
-cat >> conftest.$ac_ext <<EOF
-    (void)QStyleFactory::create(QString::null);
-    QCursor c(Qt::WhatsThisCursor);
-EOF
-fi
-cat >> conftest.$ac_ext <<EOF
-    return 0;
-}
-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; then
-  kde_cv_qt_direct="yes"
-else
-  kde_cv_qt_direct="no"
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-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
-
-
-if test "$kde_cv_qt_direct" = "yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  qt_libraries=
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-fi
-
-fi
-
-
-
-
-if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
-else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
-fi
-
-if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
- QT_LDFLAGS=""
-else
- QT_LDFLAGS="-L$qt_libraries"
- all_libraries="$all_libraries $QT_LDFLAGS"
-fi
-test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-
-
-
-
-
-   qt_bindirs=""
-   for dir in $kde_qt_dirs; do
-      qt_bindirs="$qt_bindirs $dir/bin $dir/src/moc"
-   done
-   qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
-   if test ! "$ac_qt_bindir" = "NO"; then
-      qt_bindirs="$ac_qt_bindir $qt_bindirs"
-   fi
-
-
-   echo "$as_me:$LINENO: checking for moc" >&5
-echo $ECHO_N "checking for moc... $ECHO_C" >&6
-   if test -n "$MOC"; then
-        kde_cv_path="$MOC";
-   else
-        kde_cache=`echo moc | sed 'y%./+-%__p_%'`
-
-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        kde_cv_path="NONE"
-	dirs="$qt_bindirs"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/moc"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/moc  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/moc"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/moc"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-
-    { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
-Please check whether you installed Qt correctly.
-You need to have a running moc binary.
-configure tried to run $ac_cv_path_moc and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable MOC to the right one before running
-configure.
-" >&5
-echo "$as_me: error: No Qt meta object compiler (moc) found!
-Please check whether you installed Qt correctly.
-You need to have a running moc binary.
-configure tried to run $ac_cv_path_moc and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable MOC to the right one before running
-configure.
-" >&2;}
-   { (exit 1); exit 1; }; }
-
-   else
-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-      MOC=$kde_cv_path
-
-   fi
-
-   if test -z "$UIC_NOT_NEEDED"; then
-
-   echo "$as_me:$LINENO: checking for uic" >&5
-echo $ECHO_N "checking for uic... $ECHO_C" >&6
-   if test -n "$UIC_PATH"; then
-        kde_cv_path="$UIC_PATH";
-   else
-        kde_cache=`echo uic | sed 'y%./+-%__p_%'`
-
-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        kde_cv_path="NONE"
-	dirs="$qt_bindirs"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/uic"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/uic  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/uic"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/uic"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-      UIC_PATH=""
-   else
-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-      UIC_PATH=$kde_cv_path
-
-   fi
-
-     if test -z "$UIC_PATH" ; then
-
-    { echo "$as_me:$LINENO: WARNING: No Qt ui compiler (uic) found!
-Please check whether you installed Qt correctly.
-You need to have a running uic binary.
-configure tried to run $ac_cv_path_uic and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable UIC to the right one before running
-configure.
-" >&5
-echo "$as_me: WARNING: No Qt ui compiler (uic) found!
-Please check whether you installed Qt correctly.
-You need to have a running uic binary.
-configure tried to run $ac_cv_path_uic and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable UIC to the right one before running
-configure.
-" >&2;}
-
-       exit 1
-     else
-       UIC=$UIC_PATH
-
-       if test $kde_qtver = 3; then
-
-    echo "$as_me:$LINENO: checking whether uic supports -L " >&5
-echo $ECHO_N "checking whether uic supports -L ... $ECHO_C" >&6
-    kde_cache=`echo L | sed 'y% .=/+-%____p_%'`
-    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        cat >conftest.ui <<EOT
-        <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-EOT
-        ac_uic_testrun="$UIC_PATH -L /nonexistent conftest.ui >/dev/null"
-        if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
-  (eval $ac_uic_testrun) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-            eval "kde_cv_prog_uic_$kde_cache=yes"
-        else
-            eval "kde_cv_prog_uic_$kde_cache=no"
-        fi
-        rm -f conftest*
-
-fi
-
-
-    if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-        :
-        ac_uic_supports_libpath=yes
-    else
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-        :
-        ac_uic_supports_libpath=no
-    fi
-
-
-    echo "$as_me:$LINENO: checking whether uic supports -nounload " >&5
-echo $ECHO_N "checking whether uic supports -nounload ... $ECHO_C" >&6
-    kde_cache=`echo nounload | sed 'y% .=/+-%____p_%'`
-    if eval "test \"\${kde_cv_prog_uic_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        cat >conftest.ui <<EOT
-        <!DOCTYPE UI><UI version="3" stdsetdef="1"></UI>
-EOT
-        ac_uic_testrun="$UIC_PATH -nounload  conftest.ui >/dev/null"
-        if { (eval echo "$as_me:$LINENO: \"$ac_uic_testrun\"") >&5
-  (eval $ac_uic_testrun) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-            eval "kde_cv_prog_uic_$kde_cache=yes"
-        else
-            eval "kde_cv_prog_uic_$kde_cache=no"
-        fi
-        rm -f conftest*
-
-fi
-
-
-    if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-        :
-        ac_uic_supports_nounload=yes
-    else
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-        :
-        ac_uic_supports_nounload=no
-    fi
-
-
-         if test x$ac_uic_supports_libpath = xyes; then
-             UIC="$UIC -L \$(kde_widgetdir)"
-         fi
-         if test x$ac_uic_supports_nounload = xyes; then
-             UIC="$UIC -nounload"
-         fi
-       fi
-     fi
-   else
-     UIC="echo uic not available: "
-   fi
-
-
-
-
-   UIC_TR="i18n"
-   if test $kde_qtver = 3; then
-     UIC_TR="tr2i18n"
-   fi
-
-
-
-
-
-if test -n "$LIBJPEG"; then
-echo "$as_me:$LINENO: checking if Qt needs $LIBJPEG" >&5
-echo $ECHO_N "checking if Qt needs $LIBJPEG... $ECHO_C" >&6
-if test "${kde_cv_qt_jpeg+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
- 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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-ac_save_LIBS="$LIBS"
-LIBS="$all_libraries $USER_LDFLAGS $LIBQT"
-LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
-cat >conftest.$ac_ext <<_ACEOF
-/* #line $LINENO "configure" */
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <qapplication.h>
-int
-main ()
-{
-
-            int argc;
-            char** argv;
-            QApplication app(argc, argv);
-  ;
-  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
-  eval "kde_cv_qt_jpeg=no"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "kde_cv_qt_jpeg=yes"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS="$ac_save_LIBS"
-CXXFLAGS="$ac_save_CXXFLAGS"
-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
-
-fi
-
-
-if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  LIBJPEG_QT='$(LIBJPEG)'
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-  LIBJPEG_QT=
-fi
-
-
-
-if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)'
-else
-LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)'
-fi
-test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS"
-for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do
-  if test -e "$a"; then
-     LIB_QT="$LIB_QT ${kde_int_qt}_incremental"
-     break
-  fi
-done
-
-
-
-
-
-
-
-
-
-
-
-
-
-echo "$as_me:$LINENO: checking for rpath" >&5
-echo $ECHO_N "checking for rpath... $ECHO_C" >&6
-# Check whether --enable-rpath or --disable-rpath was given.
-if test "${enable_rpath+set}" = set; then
-  enableval="$enable_rpath"
-  USE_RPATH=$enableval
-else
-  USE_RPATH=yes
-fi;
-
-if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
-
-  KDE_RPATH="-R \$(kde_libraries)"
-
-  if test -n "$qt_libraries"; then
-    KDE_RPATH="$KDE_RPATH -R \$(qt_libraries)"
-  fi
-    if test -n "$X_LDFLAGS"; then
-    X_RPATH="-R \$(x_libraries)"
-    KDE_RPATH="$KDE_RPATH $X_RPATH"
-  fi
-  if test -n "$KDE_EXTRA_RPATH"; then
-    KDE_RPATH="$KDE_RPATH \$(KDE_EXTRA_RPATH)"
-  fi
-fi
-
-
-
-echo "$as_me:$LINENO: result: $USE_RPATH" >&5
-echo "${ECHO_T}$USE_RPATH" >&6
-
-echo "$as_me:$LINENO: checking for KDE" >&5
-echo $ECHO_N "checking for KDE... $ECHO_C" >&6
-
-if test "${prefix}" != NONE; then
-  kde_includes=${includedir}
-
-savex=$exec_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-tmp=$includedir
-while ac_kde_includes=`eval echo "$tmp"`; test "x$ac_kde_includes" != "x$tmp"; do tmp=$ac_kde_includes; done
-exec_prefix=$savex
-
-
-  kde_libraries=${libdir}
-
-savex=$exec_prefix
-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
-tmp=$libdir
-while ac_kde_libraries=`eval echo "$tmp"`; test "x$ac_kde_libraries" != "x$tmp"; do tmp=$ac_kde_libraries; done
-exec_prefix=$savex
-
-
-else
-  ac_kde_includes=
-  ac_kde_libraries=
-  kde_libraries=""
-  kde_includes=""
-fi
-
-if test "${ac_cv_have_kde+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  #try to guess kde locations
-
-if test "$kde_qtver" = 1; then
-  kde_check_header="ksock.h"
-  kde_check_lib="libkdecore.la"
-else
-  kde_check_header="ksharedptr.h"
-  kde_check_lib="libkio.la"
-fi
-
-if test -z ""; then
-
-kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
-kde_incdirs="$ac_kde_includes $kde_incdirs"
-
-kde_incdir=NO
-for i in $kde_incdirs;
-do
-  for j in $kde_check_header;
-  do
-    echo "configure: 27728: $i/$j" >&5
-    if test -r "$i/$j"; then
-      echo "taking that" >&5
-      kde_incdir=$i
-      break 2
-    fi
-  done
-done
-
-ac_kde_includes="$kde_incdir"
-
-if test -n "$ac_kde_includes" && test ! -r "$ac_kde_includes/$kde_check_header"; then
-  { { echo "$as_me:$LINENO: error:
-in the prefix, you've chosen, are no KDE headers installed. This will fail.
-So, check this please and use another prefix!" >&5
-echo "$as_me: error:
-in the prefix, you've chosen, are no KDE headers installed. This will fail.
-So, check this please and use another prefix!" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-kde_libdirs="/usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
-test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
-kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
-
-kde_libdir=NO
-for i in $kde_libdirs;
-do
-  for j in $kde_check_lib;
-  do
-    echo "configure: 27758: $i/$j" >&5
-    if test -r "$i/$j"; then
-      echo "taking that" >&5
-      kde_libdir=$i
-      break 2
-    fi
-  done
-done
-
-ac_kde_libraries="$kde_libdir"
-
-kde_widgetdir=NO
-
-kde_widgetdir=NO
-for i in $kde_libdirs;
-do
-  for j in "kde3/plugins/designer/kdewidgets.la";
-  do
-    echo "configure: 27776: $i/$j" >&5
-    if test -r "$i/$j"; then
-      echo "taking that" >&5
-      kde_widgetdir=$i
-      break 2
-    fi
-  done
-done
-
-
-if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
-{ { echo "$as_me:$LINENO: error:
-in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-So, check this please and use another prefix!" >&5
-echo "$as_me: error:
-in the prefix, you've chosen, are no KDE libraries installed. This will fail.
-So, check this please and use another prefix!" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
-{ { echo "$as_me:$LINENO: error:
-I can't find the designer plugins. These are required and should have been installed
-by kdelibs" >&5
-echo "$as_me: error:
-I can't find the designer plugins. These are required and should have been installed
-by kdelibs" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-if test -n "$kde_widgetdir"; then
-    kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
-fi
-
-
-if test "$ac_kde_includes" = NO || test "$ac_kde_libraries" = NO || test "$kde_widgetdir" = NO; then
-  ac_cv_have_kde="have_kde=no"
-else
-  ac_cv_have_kde="have_kde=yes \
-    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-fi
-
-else
-  ac_cv_have_kde="have_kde=no"
-
-fi
-
-fi
-
-eval "$ac_cv_have_kde"
-
-if test "$have_kde" != "yes"; then
- if test "${prefix}" = NONE; then
-  ac_kde_prefix="$ac_default_prefix"
- else
-  ac_kde_prefix="$prefix"
- fi
- if test "$exec_prefix" = NONE; then
-  ac_kde_exec_prefix="$ac_kde_prefix"
-  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix" >&5
-echo "${ECHO_T}will be installed in $ac_kde_prefix" >&6
- else
-  ac_kde_exec_prefix="$exec_prefix"
-  echo "$as_me:$LINENO: result: will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&5
-echo "${ECHO_T}will be installed in $ac_kde_prefix and $ac_kde_exec_prefix" >&6
- fi
-
- kde_libraries="${libdir}"
- kde_includes="${includedir}"
-
-else
-  ac_cv_have_kde="have_kde=yes \
-    ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
-  echo "$as_me:$LINENO: result: libraries $ac_kde_libraries, headers $ac_kde_includes" >&5
-echo "${ECHO_T}libraries $ac_kde_libraries, headers $ac_kde_includes" >&6
-
-  kde_libraries="$ac_kde_libraries"
-  kde_includes="$ac_kde_includes"
-fi
-
-
-
-if test "$kde_includes" = "$x_includes" || test "$kde_includes" = "$qt_includes"  || test "$kde_includes" = "/usr/include"; then
- KDE_INCLUDES=""
-else
- KDE_INCLUDES="-I$kde_includes"
- all_includes="$KDE_INCLUDES $all_includes"
-fi
-
-KDE_DEFAULT_CXXFLAGS="-DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION"
-
-KDE_LDFLAGS="-L$kde_libraries"
-if test ! "$kde_libraries" = "$x_libraries" && test ! "$kde_libraries" = "$qt_libraries" ; then
- all_libraries="$all_libraries $KDE_LDFLAGS"
-fi
-
-
-
-
-
-
-all_libraries="$all_libraries $USER_LDFLAGS"
-all_includes="$all_includes $USER_INCLUDES"
-
-
-
-if test -z ""; then
-
-
-
-if test x$ac_uic_supports_libpath = xyes; then
-
-echo "$as_me:$LINENO: checking if UIC has KDE plugins available" >&5
-echo $ECHO_N "checking if UIC has KDE plugins available... $ECHO_C" >&6
-if test "${kde_cv_uic_plugins+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-cat > actest.ui << EOF
-<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
-<class>NewConnectionDialog</class>
-<widget class="QDialog">
-   <widget class="KLineEdit">
-        <property name="name">
-           <cstring>testInput</cstring>
-        </property>
-   </widget>
-</widget>
-</UI>
-EOF
-
-
-
-kde_cv_uic_plugins=no
-kde_line="$UIC_PATH -L $kde_widgetdir"
-if test x$ac_uic_supports_nounload = xyes; then
-   kde_line="$kde_line -nounload"
-fi
-kde_line="$kde_line -impl actest.h actest.ui > actest.cpp"
-if { (eval echo "$as_me:$LINENO: \"$kde_line\"") >&5
-  (eval $kde_line) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-	# if you're trying to debug this check and think it's incorrect,
-	# better check your installation. The check _is_ correct - your
-	# installation is not.
-	if test -f actest.cpp && grep -i klineedit actest.cpp > /dev/null; then
-		kde_cv_uic_plugins=yes
-	fi
-fi
-rm -f actest.ui actest.cpp
-
-fi
-
-
-echo "$as_me:$LINENO: result: $kde_cv_uic_plugins" >&5
-echo "${ECHO_T}$kde_cv_uic_plugins" >&6
-if test "$kde_cv_uic_plugins" != yes; then
-	{ { echo "$as_me:$LINENO: error: you need to install kdelibs first." >&5
-echo "$as_me: error: you need to install kdelibs first." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-fi
-
-fi
-
-ac_kde_libraries="$kde_libdir"
-
-
-
-
-
-  # Check whether --enable-path-check or --disable-path-check was given.
-if test "${enable_path_check+set}" = set; then
-  enableval="$enable_path_check"
-
-  if test "$enableval" = "no";
-    then ac_use_path_checking="default"
-    else ac_use_path_checking=""
-  fi
-
-else
-
-  if test "$kde_qtver" = 1;
-    then ac_use_path_checking=""
-    else ac_use_path_checking="default"
-  fi
-
-
-fi;
-
-
-
-
-echo "$as_me:$LINENO: checking for KDE paths" >&5
-echo $ECHO_N "checking for KDE paths... $ECHO_C" >&6
-kde_result=""
-kde_cached_paths=yes
-if test "${kde_cv_all_paths+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-if test "$ac_use_path_checking" = "default"; then
-
-  if test -z "$kde_htmldir"; then
-    kde_htmldir='\${datadir}/doc/HTML'
-  fi
-  if test -z "$kde_appsdir"; then
-    kde_appsdir='\${datadir}/applnk'
-  fi
-  if test -z "$kde_icondir"; then
-    kde_icondir='\${datadir}/icons'
-  fi
-  if test -z "$kde_sounddir"; then
-    kde_sounddir='\${datadir}/sounds'
-  fi
-  if test -z "$kde_datadir"; then
-    kde_datadir='\${datadir}/apps'
-  fi
-  if test -z "$kde_locale"; then
-    kde_locale='\${datadir}/locale'
-  fi
-  if test -z "$kde_cgidir"; then
-    kde_cgidir='\${exec_prefix}/cgi-bin'
-  fi
-  if test -z "$kde_confdir"; then
-    kde_confdir='\${datadir}/config'
-  fi
-  if test -z "$kde_kcfgdir"; then
-    kde_kcfgdir='\${datadir}/config.kcfg'
-  fi
-  if test -z "$kde_mimedir"; then
-    kde_mimedir='\${datadir}/mimelnk'
-  fi
-  if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${datadir}/toolbar'
-  fi
-  if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${datadir}/wallpapers'
-  fi
-  if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${datadir}/templates'
-  fi
-  if test -z "$kde_bindir"; then
-    kde_bindir='\${exec_prefix}/bin'
-  fi
-  if test -z "$kde_servicesdir"; then
-    kde_servicesdir='\${datadir}/services'
-  fi
-  if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${datadir}/servicetypes'
-  fi
-  if test -z "$kde_moduledir"; then
-    if test "$kde_qtver" = "2"; then
-      kde_moduledir='\${libdir}/kde2'
-    else
-      kde_moduledir='\${libdir}/kde3'
-    fi
-  fi
-  if test -z "$kde_styledir"; then
-    kde_styledir='\${libdir}/kde3/plugins/styles'
-  fi
-  if test -z "$kde_widgetdir"; then
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
-  fi
-  if test -z "$xdg_appsdir"; then
-    xdg_appsdir='\${datadir}/applications/kde'
-  fi
-  if test -z "$xdg_menudir"; then
-    xdg_menudir='\${sysconfdir}/xdg/menus'
-  fi
-  if test -z "$xdg_directorydir"; then
-    xdg_directorydir='\${datadir}/desktop-directories'
-  fi
-
-
-  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-	kde_htmldir=\"$kde_htmldir\" \
-	kde_appsdir=\"$kde_appsdir\" \
-	kde_icondir=\"$kde_icondir\" \
-	kde_sounddir=\"$kde_sounddir\" \
-	kde_datadir=\"$kde_datadir\" \
-	kde_locale=\"$kde_locale\" \
-	kde_cgidir=\"$kde_cgidir\" \
-	kde_confdir=\"$kde_confdir\" \
-	kde_kcfgdir=\"$kde_kcfgdir\" \
-	kde_mimedir=\"$kde_mimedir\" \
-	kde_toolbardir=\"$kde_toolbardir\" \
-	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-	kde_templatesdir=\"$kde_templatesdir\" \
-	kde_bindir=\"$kde_bindir\" \
-	kde_servicesdir=\"$kde_servicesdir\" \
-	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-	kde_moduledir=\"$kde_moduledir\" \
-	kde_styledir=\"$kde_styledir\" \
-	kde_widgetdir=\"$kde_widgetdir\" \
-	xdg_appsdir=\"$xdg_appsdir\" \
-	xdg_menudir=\"$xdg_menudir\" \
-	xdg_directorydir=\"$xdg_directorydir\" \
-	kde_result=defaults"
-
-
-else
-
-  if test $kde_qtver = 1; then
-     echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
-
-
-    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include "confdefs.h"
-#include <kapp.h>
-
-int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-    printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-    printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-    printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-    printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-    printf("kde_styledir=\\"/tmp/dummy\\"\n");
-    printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-    printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-    printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-    printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-    printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-    return 0;
-    }
-EOF
-
- ac_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$all_includes $CPPFLAGS"
- 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
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
-   { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
-Check, if you installed the KDE header files correctly.
-For more details about this problem, look at the end of config.log." >&5
-echo "$as_me: error: your system is not able to compile a small KDE application!
-Check, if you installed the KDE header files correctly.
-For more details about this problem, look at the end of config.log." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  CPPFLAGS=$ac_save_CPPFLAGS
-
-  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
-
-
-
-  KDE_TEST_RPATH=
-
-  if test -n "$USE_RPATH"; then
-
-     if test -n "$kde_libraries"; then
-       KDE_TEST_RPATH="-R $kde_libraries"
-     fi
-
-     if test -n "$qt_libraries"; then
-       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-     fi
-
-     if test -n "$x_libraries"; then
-       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-     fi
-
-     KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-  fi
-
-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-
-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; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
-Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
-For more details about this problem, look at the end of config.log." >&5
-echo "$as_me: error: your system fails at linking a small KDE application!
-Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
-For more details about this problem, look at the end of config.log." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-if eval `KDEDIR= ./conftest 2>&5`; then
-  kde_result=done
-else
-  kde_result=problems
-fi
-
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-kde_have_all_paths=yes
-
-
-  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-	kde_htmldir=\"$kde_htmldir\" \
-	kde_appsdir=\"$kde_appsdir\" \
-	kde_icondir=\"$kde_icondir\" \
-	kde_sounddir=\"$kde_sounddir\" \
-	kde_datadir=\"$kde_datadir\" \
-	kde_locale=\"$kde_locale\" \
-	kde_cgidir=\"$kde_cgidir\" \
-	kde_confdir=\"$kde_confdir\" \
-	kde_kcfgdir=\"$kde_kcfgdir\" \
-	kde_mimedir=\"$kde_mimedir\" \
-	kde_toolbardir=\"$kde_toolbardir\" \
-	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-	kde_templatesdir=\"$kde_templatesdir\" \
-	kde_bindir=\"$kde_bindir\" \
-	kde_servicesdir=\"$kde_servicesdir\" \
-	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-	kde_moduledir=\"$kde_moduledir\" \
-	kde_styledir=\"$kde_styledir\" \
-	kde_widgetdir=\"$kde_widgetdir\" \
-	xdg_appsdir=\"$xdg_appsdir\" \
-	xdg_menudir=\"$xdg_menudir\" \
-	xdg_directorydir=\"$xdg_directorydir\" \
-	kde_result=$kde_result"
-
-
-
-  else
-     { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
-echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
-fi
-
-  kde_cached_paths=no
-
-fi
-
-eval "$kde_cv_all_paths"
- if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-   test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-   test -z "$kde_datadir" || test -z "$kde_locale"  ||
-   test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
-   test -z "$kde_kcfgdir" ||
-   test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-   test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-   test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-   test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-   test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-   test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-   test "x$kde_have_all_paths" != "xyes"; then
-     kde_have_all_paths=no
-  fi
-
-if test "$kde_have_all_paths" = "no" && test "$kde_cached_paths" = "yes"; then
-  # wrong values were cached, may be, we can set better ones
-  kde_result=
-  kde_htmldir= kde_appsdir= kde_icondir= kde_sounddir=
-  kde_datadir= kde_locale=  kde_cgidir=  kde_confdir= kde_kcfgdir=
-  kde_mimedir= kde_toolbardir= kde_wallpaperdir= kde_templatesdir=
-  kde_bindir= kde_servicesdir= kde_servicetypesdir= kde_moduledir=
-  kde_have_all_paths=
-  kde_styledir=
-  kde_widgetdir=
-  xdg_appsdir = xdg_menudir= xdg_directorydir=
-
-if test "$ac_use_path_checking" = "default"; then
-
-  if test -z "$kde_htmldir"; then
-    kde_htmldir='\${datadir}/doc/HTML'
-  fi
-  if test -z "$kde_appsdir"; then
-    kde_appsdir='\${datadir}/applnk'
-  fi
-  if test -z "$kde_icondir"; then
-    kde_icondir='\${datadir}/icons'
-  fi
-  if test -z "$kde_sounddir"; then
-    kde_sounddir='\${datadir}/sounds'
-  fi
-  if test -z "$kde_datadir"; then
-    kde_datadir='\${datadir}/apps'
-  fi
-  if test -z "$kde_locale"; then
-    kde_locale='\${datadir}/locale'
-  fi
-  if test -z "$kde_cgidir"; then
-    kde_cgidir='\${exec_prefix}/cgi-bin'
-  fi
-  if test -z "$kde_confdir"; then
-    kde_confdir='\${datadir}/config'
-  fi
-  if test -z "$kde_kcfgdir"; then
-    kde_kcfgdir='\${datadir}/config.kcfg'
-  fi
-  if test -z "$kde_mimedir"; then
-    kde_mimedir='\${datadir}/mimelnk'
-  fi
-  if test -z "$kde_toolbardir"; then
-    kde_toolbardir='\${datadir}/toolbar'
-  fi
-  if test -z "$kde_wallpaperdir"; then
-    kde_wallpaperdir='\${datadir}/wallpapers'
-  fi
-  if test -z "$kde_templatesdir"; then
-    kde_templatesdir='\${datadir}/templates'
-  fi
-  if test -z "$kde_bindir"; then
-    kde_bindir='\${exec_prefix}/bin'
-  fi
-  if test -z "$kde_servicesdir"; then
-    kde_servicesdir='\${datadir}/services'
-  fi
-  if test -z "$kde_servicetypesdir"; then
-    kde_servicetypesdir='\${datadir}/servicetypes'
-  fi
-  if test -z "$kde_moduledir"; then
-    if test "$kde_qtver" = "2"; then
-      kde_moduledir='\${libdir}/kde2'
-    else
-      kde_moduledir='\${libdir}/kde3'
-    fi
-  fi
-  if test -z "$kde_styledir"; then
-    kde_styledir='\${libdir}/kde3/plugins/styles'
-  fi
-  if test -z "$kde_widgetdir"; then
-    kde_widgetdir='\${libdir}/kde3/plugins/designer'
-  fi
-  if test -z "$xdg_appsdir"; then
-    xdg_appsdir='\${datadir}/applications/kde'
-  fi
-  if test -z "$xdg_menudir"; then
-    xdg_menudir='\${sysconfdir}/xdg/menus'
-  fi
-  if test -z "$xdg_directorydir"; then
-    xdg_directorydir='\${datadir}/desktop-directories'
-  fi
-
-
-  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-	kde_htmldir=\"$kde_htmldir\" \
-	kde_appsdir=\"$kde_appsdir\" \
-	kde_icondir=\"$kde_icondir\" \
-	kde_sounddir=\"$kde_sounddir\" \
-	kde_datadir=\"$kde_datadir\" \
-	kde_locale=\"$kde_locale\" \
-	kde_cgidir=\"$kde_cgidir\" \
-	kde_confdir=\"$kde_confdir\" \
-	kde_kcfgdir=\"$kde_kcfgdir\" \
-	kde_mimedir=\"$kde_mimedir\" \
-	kde_toolbardir=\"$kde_toolbardir\" \
-	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-	kde_templatesdir=\"$kde_templatesdir\" \
-	kde_bindir=\"$kde_bindir\" \
-	kde_servicesdir=\"$kde_servicesdir\" \
-	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-	kde_moduledir=\"$kde_moduledir\" \
-	kde_styledir=\"$kde_styledir\" \
-	kde_widgetdir=\"$kde_widgetdir\" \
-	xdg_appsdir=\"$xdg_appsdir\" \
-	xdg_menudir=\"$xdg_menudir\" \
-	xdg_directorydir=\"$xdg_directorydir\" \
-	kde_result=defaults"
-
-
-else
-
-  if test $kde_qtver = 1; then
-     echo "$as_me:$LINENO: result: compiling" >&5
-echo "${ECHO_T}compiling" >&6
-
-
-    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
-echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-cat > conftest.$ac_ext <<EOF
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
-#include <stdio.h>
-#include "confdefs.h"
-#include <kapp.h>
-
-int main() {
-    printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data());
-    printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data());
-    printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data());
-    printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data());
-    printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data());
-    printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data());
-    printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data());
-    printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data());
-    printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data());
-    printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data());
-    printf("kde_wallpaperdir=\\"%s\\"\n",
-	KApplication::kde_wallpaperdir().data());
-    printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
-    printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
-    printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
-    printf("kde_moduledir=\\"/tmp/dummy\\"\n");
-    printf("kde_styledir=\\"/tmp/dummy\\"\n");
-    printf("kde_widgetdir=\\"/tmp/dummy\\"\n");
-    printf("xdg_appsdir=\\"/tmp/dummy\\"\n");
-    printf("xdg_menudir=\\"/tmp/dummy\\"\n");
-    printf("xdg_directorydir=\\"/tmp/dummy\\"\n");
-    printf("kde_kcfgdir=\\"/tmp/dummy\\"\n");
-    return 0;
-    }
-EOF
-
- ac_save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$all_includes $CPPFLAGS"
- 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
-   echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
-   { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
-Check, if you installed the KDE header files correctly.
-For more details about this problem, look at the end of config.log." >&5
-echo "$as_me: error: your system is not able to compile a small KDE application!
-Check, if you installed the KDE header files correctly.
-For more details about this problem, look at the end of config.log." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  CPPFLAGS=$ac_save_CPPFLAGS
-
-  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
-
-
-
-  KDE_TEST_RPATH=
-
-  if test -n "$USE_RPATH"; then
-
-     if test -n "$kde_libraries"; then
-       KDE_TEST_RPATH="-R $kde_libraries"
-     fi
-
-     if test -n "$qt_libraries"; then
-       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $qt_libraries"
-     fi
-
-     if test -n "$x_libraries"; then
-       KDE_TEST_RPATH="$KDE_TEST_RPATH -R $x_libraries"
-     fi
-
-     KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
-  fi
-
-echo "$as_me:$LINENO: checking for KDE libraries installed" >&5
-echo $ECHO_N "checking for KDE libraries installed... $ECHO_C" >&6
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
-
-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; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
-Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
-For more details about this problem, look at the end of config.log." >&5
-echo "$as_me: error: your system fails at linking a small KDE application!
-Check, if your compiler is installed correctly and if you have used the
-same compiler to compile Qt and kdelibs as you did use now.
-For more details about this problem, look at the end of config.log." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-if eval `KDEDIR= ./conftest 2>&5`; then
-  kde_result=done
-else
-  kde_result=problems
-fi
-
-KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
-kde_have_all_paths=yes
-
-
-  kde_cv_all_paths="kde_have_all_paths=\"yes\" \
-	kde_htmldir=\"$kde_htmldir\" \
-	kde_appsdir=\"$kde_appsdir\" \
-	kde_icondir=\"$kde_icondir\" \
-	kde_sounddir=\"$kde_sounddir\" \
-	kde_datadir=\"$kde_datadir\" \
-	kde_locale=\"$kde_locale\" \
-	kde_cgidir=\"$kde_cgidir\" \
-	kde_confdir=\"$kde_confdir\" \
-	kde_kcfgdir=\"$kde_kcfgdir\" \
-	kde_mimedir=\"$kde_mimedir\" \
-	kde_toolbardir=\"$kde_toolbardir\" \
-	kde_wallpaperdir=\"$kde_wallpaperdir\" \
-	kde_templatesdir=\"$kde_templatesdir\" \
-	kde_bindir=\"$kde_bindir\" \
-	kde_servicesdir=\"$kde_servicesdir\" \
-	kde_servicetypesdir=\"$kde_servicetypesdir\" \
-	kde_moduledir=\"$kde_moduledir\" \
-	kde_styledir=\"$kde_styledir\" \
-	kde_widgetdir=\"$kde_widgetdir\" \
-	xdg_appsdir=\"$xdg_appsdir\" \
-	xdg_menudir=\"$xdg_menudir\" \
-	xdg_directorydir=\"$xdg_directorydir\" \
-	kde_result=$kde_result"
-
-
-
-  else
-     { { echo "$as_me:$LINENO: error: path checking not yet supported for KDE 2" >&5
-echo "$as_me: error: path checking not yet supported for KDE 2" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
-fi
-
-  eval "$kde_cv_all_paths"
-   if test -z "$kde_htmldir" || test -z "$kde_appsdir" ||
-   test -z "$kde_icondir" || test -z "$kde_sounddir" ||
-   test -z "$kde_datadir" || test -z "$kde_locale"  ||
-   test -z "$kde_cgidir"  || test -z "$kde_confdir" ||
-   test -z "$kde_kcfgdir" ||
-   test -z "$kde_mimedir" || test -z "$kde_toolbardir" ||
-   test -z "$kde_wallpaperdir" || test -z "$kde_templatesdir" ||
-   test -z "$kde_bindir" || test -z "$kde_servicesdir" ||
-   test -z "$kde_servicetypesdir" || test -z "$kde_moduledir" ||
-   test -z "$kde_styledir" || test -z "kde_widgetdir" ||
-   test -z "$xdg_appsdir" || test -z "$xdg_menudir" || test -z "$xdg_directorydir" ||
-   test "x$kde_have_all_paths" != "xyes"; then
-     kde_have_all_paths=no
-  fi
-
-  kde_result="$kde_result (cache overridden)"
-fi
-if test "$kde_have_all_paths" = "no"; then
-  { { echo "$as_me:$LINENO: error: configure could not run a little KDE program to test the environment.
-Since it had compiled and linked before, it must be a strange problem on your system.
-Look at config.log for details. If you are not able to fix this, look at
-http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-(If you're using an egcs version on Linux, you may update binutils!)
-" >&5
-echo "$as_me: error: configure could not run a little KDE program to test the environment.
-Since it had compiled and linked before, it must be a strange problem on your system.
-Look at config.log for details. If you are not able to fix this, look at
-http://www.kde.org/faq/installation.html or any www.kde.org mirror.
-(If you're using an egcs version on Linux, you may update binutils!)
-" >&2;}
-   { (exit 1); exit 1; }; }
-else
-  rm -f conftest*
-  echo "$as_me:$LINENO: result: $kde_result" >&5
-echo "${ECHO_T}$kde_result" >&6
-fi
-
-bindir=$kde_bindir
-
-
-
-# Check whether --with-arts or --without-arts was given.
-if test "${with_arts+set}" = set; then
-  withval="$with_arts"
-  build_arts=$withval
-else
-  build_arts=yes
-
-fi;
-
-
-if test "$build_arts" != "no"; then
-  include_ARTS_TRUE=
-  include_ARTS_FALSE='#'
-else
-  include_ARTS_TRUE='#'
-  include_ARTS_FALSE=
-fi
-
-
-        kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
-        test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
-        if test -n "$KDEDIRS"; then
-           kde_save_IFS=$IFS
-           IFS=:
-           for dir in $KDEDIRS; do
-                kde_default_bindirs="$dir/bin $kde_default_bindirs "
-           done
-           IFS=$kde_save_IFS
-        fi
-        kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
-
-   echo "$as_me:$LINENO: checking for dcopidl" >&5
-echo $ECHO_N "checking for dcopidl... $ECHO_C" >&6
-   if test -n "$DCOPIDL"; then
-        kde_cv_path="$DCOPIDL";
-   else
-        kde_cache=`echo dcopidl | sed 'y%./+-%__p_%'`
-
-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        kde_cv_path="NONE"
-	dirs="$kde_default_bindirs"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/dcopidl"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/dcopidl  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/dcopidl"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/dcopidl"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-
-    { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
-Please check whether you installed KDE correctly.
-" >&5
-echo "$as_me: error: The important program dcopidl was not found!
-Please check whether you installed KDE correctly.
-" >&2;}
-   { (exit 1); exit 1; }; }
-
-   else
-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-      DCOPIDL=$kde_cv_path
-
-   fi
-
-
-   echo "$as_me:$LINENO: checking for dcopidl2cpp" >&5
-echo $ECHO_N "checking for dcopidl2cpp... $ECHO_C" >&6
-   if test -n "$DCOPIDL2CPP"; then
-        kde_cv_path="$DCOPIDL2CPP";
-   else
-        kde_cache=`echo dcopidl2cpp | sed 'y%./+-%__p_%'`
-
-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        kde_cv_path="NONE"
-	dirs="$kde_default_bindirs"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/dcopidl2cpp"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/dcopidl2cpp  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/dcopidl2cpp"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/dcopidl2cpp"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-
-    { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
-Please check whether you installed KDE correctly.
-" >&5
-echo "$as_me: error: The important program dcopidl2cpp was not found!
-Please check whether you installed KDE correctly.
-" >&2;}
-   { (exit 1); exit 1; }; }
-
-   else
-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-      DCOPIDL2CPP=$kde_cv_path
-
-   fi
-
-        if test "$build_arts" != "no"; then
-
-   echo "$as_me:$LINENO: checking for mcopidl" >&5
-echo $ECHO_N "checking for mcopidl... $ECHO_C" >&6
-   if test -n "$MCOPIDL"; then
-        kde_cv_path="$MCOPIDL";
-   else
-        kde_cache=`echo mcopidl | sed 'y%./+-%__p_%'`
-
-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        kde_cv_path="NONE"
-	dirs="$kde_default_bindirs"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/mcopidl"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/mcopidl  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/mcopidl"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/mcopidl"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-
-    { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
-Please check whether you installed aRts correctly or use
---without-arts to compile without aRts support (this will remove functionality).
-" >&5
-echo "$as_me: error: The important program mcopidl was not found!
-Please check whether you installed aRts correctly or use
---without-arts to compile without aRts support (this will remove functionality).
-" >&2;}
-   { (exit 1); exit 1; }; }
-
-   else
-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-      MCOPIDL=$kde_cv_path
-
-   fi
-
-
-   echo "$as_me:$LINENO: checking for artsc-config" >&5
-echo $ECHO_N "checking for artsc-config... $ECHO_C" >&6
-   if test -n "$ARTSCCONFIG"; then
-        kde_cv_path="$ARTSCCONFIG";
-   else
-        kde_cache=`echo artsc-config | sed 'y%./+-%__p_%'`
-
-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        kde_cv_path="NONE"
-	dirs="$kde_default_bindirs"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/artsc-config"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/artsc-config  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/artsc-config"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/artsc-config"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-
-    { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
-Please check whether you installed aRts correctly or use
---without-arts to compile without aRts support (this will remove functionality).
-" >&5
-echo "$as_me: error: The important program artsc-config was not found!
-Please check whether you installed aRts correctly or use
---without-arts to compile without aRts support (this will remove functionality).
-" >&2;}
-   { (exit 1); exit 1; }; }
-
-   else
-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-      ARTSCCONFIG=$kde_cv_path
-
-   fi
-
-        fi
-
-   echo "$as_me:$LINENO: checking for kde-config" >&5
-echo $ECHO_N "checking for kde-config... $ECHO_C" >&6
-   if test -n "$KDECONFIG"; then
-        kde_cv_path="$KDECONFIG";
-   else
-        kde_cache=`echo kde-config | sed 'y%./+-%__p_%'`
-
-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        kde_cv_path="NONE"
-	dirs="$kde_default_bindirs"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/kde-config"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/kde-config  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/kde-config"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/kde-config"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-
-   else
-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-      KDECONFIG=$kde_cv_path
-
-   fi
-
-
-   echo "$as_me:$LINENO: checking for meinproc" >&5
-echo $ECHO_N "checking for meinproc... $ECHO_C" >&6
-   if test -n "$MEINPROC"; then
-        kde_cv_path="$MEINPROC";
-   else
-        kde_cache=`echo meinproc | sed 'y%./+-%__p_%'`
-
-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        kde_cv_path="NONE"
-	dirs="$kde_default_bindirs"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/meinproc"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/meinproc  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/meinproc"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/meinproc"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-
-   else
-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-      MEINPROC=$kde_cv_path
-
-   fi
-
-
-        kde32ornewer=1
-        if test "$kde_qtver" -lt 3; then
-            kde32ornewer=
-        else
-            if test "$kde_qtver" = "3" && test "$kde_qtsubver" -le 1; then
-                kde32ornewer=
-            fi
-        fi
-
-        if test -n "$kde32ornewer"; then
-
-   echo "$as_me:$LINENO: checking for kconfig_compiler" >&5
-echo $ECHO_N "checking for kconfig_compiler... $ECHO_C" >&6
-   if test -n "$KCONFIG_COMPILER"; then
-        kde_cv_path="$KCONFIG_COMPILER";
-   else
-        kde_cache=`echo kconfig_compiler | sed 'y%./+-%__p_%'`
-
-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        kde_cv_path="NONE"
-	dirs="$kde_default_bindirs"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/kconfig_compiler"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/kconfig_compiler  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/kconfig_compiler"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/kconfig_compiler"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-
-    { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
-Please check whether you installed KDE correctly.
-" >&5
-echo "$as_me: error: The important program kconfig_compiler was not found!
-Please check whether you installed KDE correctly.
-" >&2;}
-   { (exit 1); exit 1; }; }
-
-   else
-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-      KCONFIG_COMPILER=$kde_cv_path
-
-   fi
-
-
-   echo "$as_me:$LINENO: checking for dcopidlng" >&5
-echo $ECHO_N "checking for dcopidlng... $ECHO_C" >&6
-   if test -n "$DCOPIDLNG"; then
-        kde_cv_path="$DCOPIDLNG";
-   else
-        kde_cache=`echo dcopidlng | sed 'y%./+-%__p_%'`
-
-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        kde_cv_path="NONE"
-	dirs="$kde_default_bindirs"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/dcopidlng"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/dcopidlng  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/dcopidlng"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/dcopidlng"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-
-    { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
-Please check whether you installed KDE correctly.
-" >&5
-echo "$as_me: error: The important program dcopidlng was not found!
-Please check whether you installed KDE correctly.
-" >&2;}
-   { (exit 1); exit 1; }; }
-
-   else
-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-      DCOPIDLNG=$kde_cv_path
-
-   fi
-
-        fi
-
-   echo "$as_me:$LINENO: checking for xmllint" >&5
-echo $ECHO_N "checking for xmllint... $ECHO_C" >&6
-   if test -n "$XMLLINT"; then
-        kde_cv_path="$XMLLINT";
-   else
-        kde_cache=`echo xmllint | sed 'y%./+-%__p_%'`
-
-        if eval "test \"\${kde_cv_path_$kde_cache+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        kde_cv_path="NONE"
-	dirs="${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin"
-	kde_save_IFS=$IFS
-	IFS=':'
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-        done
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/xmllint"; then
-	    if test -n ""
-	    then
-              evalstr="$dir/xmllint  2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/xmllint"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/xmllint"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-
-fi
-
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      echo "$as_me:$LINENO: result: not found" >&5
-echo "${ECHO_T}not found" >&6
-      XMLLINT=""
-   else
-      echo "$as_me:$LINENO: result: $kde_cv_path" >&5
-echo "${ECHO_T}$kde_cv_path" >&6
-      XMLLINT=$kde_cv_path
-
-   fi
-
-
-        if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then
- 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
-            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
-
-KDE_XSL_STYLESHEET=NO
-for i in $kde_sharedirs;
-do
-  for j in apps/ksgmltools2/customization/kde-chunk.xsl;
-  do
-    echo "configure: 29224: $i/$j" >&5
-    if test -r "$i/$j"; then
-      echo "taking that" >&5
-      KDE_XSL_STYLESHEET=$i
-      break 2
-    fi
-  done
-done
-
-	    if test "$KDE_XSL_STYLESHEET" = "NO"; then
-		KDE_XSL_STYLESHEET=""
-	    else
-                KDE_XSL_STYLESHEET="$KDE_XSL_STYLESHEET/apps/ksgmltools2/customization/kde-chunk.xsl"
-	    fi
-        fi
-
-        DCOP_DEPENDENCIES='$(DCOPIDL)'
-        if test -n "$kde32ornewer"; then
-            KCFG_DEPENDENCIES='$(KCONFIG_COMPILER)'
-            DCOP_DEPENDENCIES='$(DCOPIDL) $(DCOPIDLNG)'
-
-
-
-        fi
-
-
-
-
-
-
-
-
-
-
-        if test -x "$KDECONFIG"; then # it can be "compiled"
-          kde_libs_prefix=`$KDECONFIG --prefix`
-          if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
-               { { echo "$as_me:$LINENO: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
-                          This means it has been moved since you installed it.
-                          This won't work. Please recompile kdelibs for the new prefix.
-                          " >&5
-echo "$as_me: error: $KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs.
-                          This means it has been moved since you installed it.
-                          This won't work. Please recompile kdelibs for the new prefix.
-                          " >&2;}
-   { (exit 1); exit 1; }; }
-           fi
-           kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
-        else
-           kde_libs_prefix='$(prefix)'
-           kde_libs_htmldir='$(kde_htmldir)'
-        fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-kdeinitdir='$(kde_moduledir)'
-
-
-
-if test "$kde_qtver" = 1; then
-  kde_minidir="$kde_icondir/mini"
-else
-# for KDE 1 - this breaks KDE2 apps using minidir, but
-# that's the plan ;-/
-  kde_minidir="/dev/null"
-fi
-
-
-
-
-
-
-if test $kde_qtver = 3; then
-   LIB_KDECORE="-lkdecore"
-
-   LIB_KDEUI="-lkdeui"
-
-   LIB_KIO="-lkio"
-
-   LIB_SMB="-lsmb"
-
-   LIB_KAB="-lkab"
-
-   LIB_KABC="-lkabc"
-
-   LIB_KHTML="-lkhtml"
-
-   LIB_KSPELL="-lkspell"
-
-   LIB_KPARTS="-lkparts"
-
-   LIB_KDEPRINT="-lkdeprint"
-
-   LIB_KUTILS="-lkutils"
-
-   LIB_KDEPIM="-lkdepim"
-
-# these are for backward compatibility
-   LIB_KSYCOCA="-lkio"
-
-   LIB_KFILE="-lkio"
-
-elif test $kde_qtver = 2; then
-   LIB_KDECORE="-lkdecore"
-
-   LIB_KDEUI="-lkdeui"
-
-   LIB_KIO="-lkio"
-
-   LIB_KSYCOCA="-lksycoca"
-
-   LIB_SMB="-lsmb"
-
-   LIB_KFILE="-lkfile"
-
-   LIB_KAB="-lkab"
-
-   LIB_KHTML="-lkhtml"
-
-   LIB_KSPELL="-lkspell"
-
-   LIB_KPARTS="-lkparts"
-
-   LIB_KDEPRINT="-lkdeprint"
-
-else
-   LIB_KDECORE="-lkdecore -lXext $(LIB_QT)"
-
-   LIB_KDEUI="-lkdeui $(LIB_KDECORE)"
-
-   LIB_KFM="-lkfm $(LIB_KDECORE)"
-
-   LIB_KFILE="-lkfile $(LIB_KFM) $(LIB_KDEUI)"
-
-   LIB_KAB="-lkab $(LIB_KIMGIO) $(LIB_KDECORE)"
-
-fi
-
-
-
-
-CPPFLAGS="$CPPFLAGS -DQT_NO_ASCII_CAST -DQT_NO_COMPAT -DQT_CLEAN_NAMESPACE -Wall -I\$(top_srcdir)/ -I\$(top_srcdir)/bibletime"
-
-ac_use_static="NO"
-
-echo "$as_me:$LINENO: checking whether to use static linking" >&5
-echo $ECHO_N "checking whether to use static linking... $ECHO_C" >&6
-# Check whether --enable-static-linking or --disable-static-linking was given.
-if test "${enable_static_linking+set}" = set; then
-  enableval="$enable_static_linking"
-  USE_STATIC_LINKING=$enableval
-else
-  USE_STATIC_LINKING="no"
-fi;
-
-if test "$USE_STATIC_LINKING" = "yes"; then
-	BT_LDFLAGS="-all-static -Wl,-Bstatic";
-
-	CPPFLAGS="-DSTATIC_BUILD $CPPFLAGS";
-	ac_use_static="YES";
-else
-	ac_use_static="NO";
-fi
-
-echo "$as_me:$LINENO: result: $USE_STATIC_LINKING" >&5
-echo "${ECHO_T}$USE_STATIC_LINKING" >&6
-
-
-
-
-# Check whether --with-sword-dir or --without-sword-dir was given.
-if test "${with_sword_dir+set}" = set; then
-  withval="$with_sword_dir"
-
-  ac_sword_dir=$withval
-
-else
-  ac_sword_dir=/usr
-
-fi;
-
-# Check whether --enable-static-sword or --disable-static-sword was given.
-if test "${enable_static_sword+set}" = set; then
-  enableval="$enable_static_sword"
-  ac_static_sword="YES"
-else
-   ac_static_sword="$ac_use_static"
-
-fi;
-
-echo "$as_me:$LINENO: checking for Sword library files" >&5
-echo $ECHO_N "checking for Sword library files... $ECHO_C" >&6
-
-ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
-
-if test "x$ac_static_sword" = "xYES"; then
-	SEARCH_LIBS="libsword.a";
-else
-	SEARCH_LIBS="libsword.so libsword.a";
-fi
-
-
-if test "${ac_cv_sword_libdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-ac_cv_sword_libdir=NO
-for i in $ac_sword_library_dirs;
-do
-  for j in $SEARCH_LIBS;
-  do
-    echo "configure: 29457: $i/$j" >&5
-    if test -r "$i/$j"; then
-      echo "taking that" >&5
-      ac_cv_sword_libdir=$i
-      break 2
-    fi
-  done
-done
-
-fi
-
-
-if test "x$ac_cv_sword_libdir" = "xNO"; then
-  { { echo "$as_me:$LINENO: error: SWORD library not found. Try to use configure with --with-sword-dir=/your/SWORD/path!" >&5
-echo "$as_me: error: SWORD library not found. Try to use configure with --with-sword-dir=/your/SWORD/path!" >&2;}
-   { (exit 1); exit 1; }; };
-fi
-
-if test "x$ac_static_sword" = "xYES"; then
-	LIB_SWORD="$ac_cv_sword_libdir/libsword.a";
-else
-	LIB_SWORD="-lsword";
-fi
-
-
-
-all_libraries="$all_libraries -L$ac_cv_sword_libdir"
-
-if test "x$ac_static_sword" = "xYES"; then
-	MESSAGE="static library $ac_cv_sword_libdir/libsword.a";
-else
-	MESSAGE="$ac_cv_sword_libdir";
-fi
-echo "$as_me:$LINENO: result: $MESSAGE" >&5
-echo "${ECHO_T}$MESSAGE" >&6
-
-echo "$as_me:$LINENO: checking for Sword include files" >&5
-echo $ECHO_N "checking for Sword include files... $ECHO_C" >&6
-ac_sword_include_dirs="$ac_sword_dir/include/sword $ac_sword_dir/include /usr/include/sword /usr/include /usr/local/include/sword /usr/local/include /usr/local/sword/include /usr/local/sword/include/sword"
-
-if test "${ac_cv_sword_incdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-ac_cv_sword_incdir=NO
-for i in $ac_sword_include_dirs;
-do
-  for j in swmgr.h;
-  do
-    echo "configure: 29506: $i/$j" >&5
-    if test -r "$i/$j"; then
-      echo "taking that" >&5
-      ac_cv_sword_incdir=$i
-      break 2
-    fi
-  done
-done
-
-fi
-
-
-if test "x$ac_cv_sword_incdir" = "xNO"; then
-	{ { echo "$as_me:$LINENO: error: The Sword include file files were not found.
-Please try to use configure with --with-sword-dir=/your/SWORD/path !
-" >&5
-echo "$as_me: error: The Sword include file files were not found.
-Please try to use configure with --with-sword-dir=/your/SWORD/path !
-" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-SWORD_INCLUDES="-I$ac_cv_sword_incdir"
-
-all_includes="$all_includes -I$ac_cv_sword_incdir"
-
-echo "$as_me:$LINENO: result: $ac_cv_sword_incdir" >&5
-echo "${ECHO_T}$ac_cv_sword_incdir" >&6
-
-
-
-
-echo "$as_me:$LINENO: checking for installed Sword version" >&5
-echo $ECHO_N "checking for installed Sword version... $ECHO_C" >&6
-
-if test "${ac_cv_installed_sword_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
- 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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$"
-LDFLAGS="$LDFLAGS -L$ac_cv_sword_libdir"
-LIBS="$LIB_SWORD -lz"
-LD_LIBRARY_PATH="$ac_cv_sword_libdir"
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-cat > conftest.$ac_ext <<EOF
-#include <iostream>
-#include <swversion.h>
-
-#ifdef SWORD_NAMESPACE_START
-using namespace sword;
-#endif
-
-int main(int argc, char* argv) {
-	std::cout << SWVersion::currentVersion << std::endl;
-	return 0;
-}
-EOF
-
-
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-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; then
-	if test -x conftest; then
-		eval ac_cv_installed_sword_version=`./conftest 2>&5`
-	fi
-else
-  echo "configure: failed program was:" >&5
-  { { echo "$as_me:$LINENO: error: Failed to compile the test program to check the Sword version! Please have a look at config.log! Report this to the BibleTime developers!" >&5
-echo "$as_me: error: Failed to compile the test program to check the Sword version! Please have a look at config.log! Report this to the BibleTime developers!" >&2;}
-   { (exit 1); exit 1; }; };
-  cat conftest.$ac_ext >&5
-fi
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-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: $ac_cv_installed_sword_version" >&5
-echo "${ECHO_T}$ac_cv_installed_sword_version" >&6
-
-
-
-
-echo "$as_me:$LINENO: checking whether your Sword installation is recent enough" >&5
-echo $ECHO_N "checking whether your Sword installation is recent enough... $ECHO_C" >&6
-
-if test "${ac_cv_sword_recent_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
-
- 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_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$"
-LDFLAGS="$LDFLAGS -L$ac_cv_sword_libdir"
-LIBS="$LIB_SWORD -lz"
-LD_LIBRARY_PATH="$ac_cv_sword_libdir"
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-cat > conftest.$ac_ext <<EOF
-#include <iostream>
-#include <swversion.h>
-
-#ifdef SWORD_NAMESPACE_START
-using namespace sword;
-#endif
-
-
-int main(int argc, char* argv[]) {
-	if (argc == 2) { //compare required with installed Sword version
-		const char* requiredVersion( argv[1] );
-		if ( (SWVersion( requiredVersion ) < SWVersion::currentVersion) || (SWVersion( requiredVersion ) == SWVersion::currentVersion) ) {
-			std::cout << "ok";
-			return -1;
-		}
-		else {
-			std::cout << "not-ok";
-			return -2; //version not recent enough
-		}
-	}
-	return 0;
-}
-EOF
-
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-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; then
-	if test -x conftest; then
-		eval ac_cv_sword_recent_version=`./conftest 1.5.7 2>&5`
-	fi
-else
-  echo "configure: failed program was:" >&5
-  { { echo "$as_me:$LINENO: error: Failed to compile the test program to check the Sword version! Please have a look at config.log! Report this to the BibleTime developers!" >&5
-echo "$as_me: error: Failed to compile the test program to check the Sword version! Please have a look at config.log! Report this to the BibleTime developers!" >&2;}
-   { (exit 1); exit 1; }; };
-  cat conftest.$ac_ext >&5
-fi;
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-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
-
-
-if test "x$ac_cv_sword_recent_version" = "xok"; then
-	echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6;
-elif test "x$ac_cv_sword_recent_version" = "xnot-ok"; then
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6;
-	{ { echo "$as_me:$LINENO: error: Your Sword installation is not recent enought! Please upgrade to version 1.5.7! Get the Sword library at www.crosswire.org." >&5
-echo "$as_me: error: Your Sword installation is not recent enought! Please upgrade to version 1.5.7! Get the Sword library at www.crosswire.org." >&2;}
-   { (exit 1); exit 1; }; };
-else
-	{ { echo "$as_me:$LINENO: error: Invalid return code of the internal Sword version test program. Please submit a bugreport!" >&5
-echo "$as_me: error: Invalid return code of the internal Sword version test program. Please submit a bugreport!" >&2;}
-   { (exit 1); exit 1; }; };
-fi;
-
-
-
- if test "${my_cv_curl_vers+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- my_cv_curl_vers=NONE
-  check="7.9"
-  check_hex="070900"
-
- echo "$as_me:$LINENO: checking for curl >= $check" >&5
-echo $ECHO_N "checking for curl >= $check... $ECHO_C" >&6
-
- if eval curl-config --version 2>/dev/null >/dev/null; then
-   ver=`curl-config --version | sed -e "s/libcurl //g"`
-   hex_ver=`curl-config --vernum | tr 'a-f' 'A-F'`
-   ok=`echo "ibase=16; if($hex_ver>=$check_hex) $hex_ver else 0" | bc`
-
-   if test x$ok != x0; then
-     my_cv_curl_vers="$ver"
-     echo "$as_me:$LINENO: result: $my_cv_curl_vers" >&5
-echo "${ECHO_T}$my_cv_curl_vers" >&6
-   else
-     echo "$as_me:$LINENO: result: FAILED" >&5
-echo "${ECHO_T}FAILED" >&6
-		 { { echo "$as_me:$LINENO: error: $ver is too old. Please install libcurl version $check or higher." >&5
-echo "$as_me: error: $ver is too old. Please install libcurl version $check or higher." >&2;}
-   { (exit 1); exit 1; }; };
-   fi
- else
-   echo "$as_me:$LINENO: result: FAILED" >&5
-echo "${ECHO_T}FAILED" >&6
-   { { echo "$as_me:$LINENO: error: curl-config was not found. Please install libcurl version $check or higher." >&5
-echo "$as_me: error: curl-config was not found. Please install libcurl version $check or higher." >&2;}
-   { (exit 1); exit 1; }; }
- fi
-
-fi
-
-
-
-
-echo "$as_me:$LINENO: checking for the used Linux distribution" >&5
-echo $ECHO_N "checking for the used Linux distribution... $ECHO_C" >&6
-
-
-# Check whether --with-distribution or --without-distribution was given.
-if test "${with_distribution+set}" = set; then
-  withval="$with_distribution"
-
-  ac_distribution=$withval
-
-else
-  ac_distribution=auto
-
-fi;
-
-
-# Check whether --with-distribution-version or --without-distribution-version was given.
-if test "${with_distribution_version+set}" = set; then
-  withval="$with_distribution_version"
-
-  ac_distribution_version=$withval
-
-else
-  ac_distribution_version=auto
-
-fi;
-
-
-# Check whether --with-rpm-prefix or --without-rpm-prefix was given.
-if test "${with_rpm_prefix+set}" = set; then
-  withval="$with_rpm_prefix"
-
-  ac_rpm_prefix=$withval
-
-else
-  ac_rpm_prefix=auto
-
-fi;
-
-
-# Check whether --with-rpm-group or --without-rpm-group was given.
-if test "${with_rpm_group+set}" = set; then
-  withval="$with_rpm_group"
-
-  ac_rpm_group=$withval
-
-else
-  ac_rpm_group=auto
-
-fi;
-
-if test "$ac_distribution" != "auto"; then
-	DISTRIBUTION=$ac_distribution
-fi
-
-if test "$ac_distribution" = "auto"; then
-if test "${DISTRIBUTION+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if test -f "/etc/SuSE-release"; then
-	DISTRIBUTION="SuSE"
-elif test -f "/etc/mandrake-release"; then
-	DISTRIBUTION="Mandrake"
-elif test -f "/etc/redhat-release"; then
-	DISTRIBUTION="Red Hat"
-elif test -f "/etc/debian_version"; then
-	DISTRIBUTION="Debian"
-fi
-
-fi
-
-fi
-
-if test "$ac_distribution_version" != "auto"; then
-	DISTRIBUTION_VERSION=$ac_distribution_version
-fi
-if test "$ac_distribution_version" = "auto"; then
-if test "${DISTRIBUTION_VERSION+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if test -f "/etc/SuSE-release" && test "$DISTRIBUTION" = "SuSE"; then
-	DISTRIBUTION_VERSION=`grep "VERSION =" /etc/SuSE-release | sed 's/VERSION = //'`;
-elif test -f "/etc/mandrake-release" && test "$DISTRIBUTION" = "Mandrake"; then
-	DISTRIBUTION_VERSION=`grep "Mandrake" /etc/mandrake-release | sed 's/[a-zA-Z()]*//g' | awk '{print }'`
-elif test -f "/etc/redhat-release" && test "$DISTRIBUTION" = "Red Hat"; then
-	DISTRIBUTION_VERSION=`grep "Red Hat" /etc/redhat-release | sed 's/[a-zA-Z()]*//g' | awk '{print }'`
-elif test -f "/etc/debian_version" && test "$DISTRIBUTION" = "Debian"; then
-	DISTRIBUTION_VERSION=`cat /etc/debian_version`
-fi
-
-fi
-
-fi
-
-
-if test "$ac_rpm_prefix" != "auto"; then
-	RPM_PREFIX=$ac_rpm_prefix
-fi
-if test "$ac_rpm_prefix" = "auto"; then
-if test "${RPM_PREFIX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_PREFIX="/opt/kde3"
-elif test "$DISTRIBUTION" = "Mandrake"; then
-	RPM_PREFIX="/usr"
-elif test "$DISTRIBUTION" = "Red Hat"; then
-	RPM_PREFIX="/usr"
-elif test "$DISTRIBUTION" = "Debian"; then
-	RPM_PREFIX="/usr"
-fi
-
-fi
-
-fi
-
-if test "$ac_rpm_group" != "auto"; then
-	RPM_GROUP=$ac_rpm_group
-fi
-if test "$ac_rpm_prefix" = "auto"; then
-if test "${RPM_GROUP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if test "$DISTRIBUTION" = "SuSE"; then
-	RPM_GROUP="X11/KDE/Applications"
-elif test "$DISTRIBUTION" = "Mandrake"; then
-	RPM_GROUP="Graphical desktop/KDE"
-elif test "$DISTRIBUTION" = "Red Hat"; then
-	RPM_GROUP="Graphical desktop/KDE"
-elif test "$DISTRIBUTION" = "Debian"; then
-	RPM_GROUP="Graphical desktop/KDE"
-fi
-
-fi
-
-fi
-
-if test -n "$DISTRIBUTION" && test "$DISTRIBUTION" != "unknown"; then
-
-cat >>confdefs.h <<_ACEOF
-#define DISTRIBUTION ${DISTRIBUTION}
-_ACEOF
-
-fi
-
-if test -n "$DISTRIBUTION_VERSION"  && test "$DISTRIBUTION_VERSION" != "unknown"; then
-
-cat >>confdefs.h <<_ACEOF
-#define DISTRIBUTION_VERSION ${DISTRIBUTION_VERSION}
-_ACEOF
-
-fi
-
-
-
-
-
-
-echo "$as_me:$LINENO: result: $DISTRIBUTION $DISTRIBUTION_VERSION" >&5
-echo "${ECHO_T}$DISTRIBUTION $DISTRIBUTION_VERSION" >&6
-
-echo "$as_me:$LINENO: checking for RPM installation prefix" >&5
-echo $ECHO_N "checking for RPM installation prefix... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $RPM_PREFIX" >&5
-echo "${ECHO_T}$RPM_PREFIX" >&6
-
-echo "$as_me:$LINENO: checking for the correct RPM group" >&5
-echo $ECHO_N "checking for the correct RPM group... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $RPM_GROUP" >&5
-echo "${ECHO_T}$RPM_GROUP" >&6
-
-
-
-          ac_config_files="$ac_config_files NEWS"
-
-          ac_config_files="$ac_config_files README"
-
-          ac_config_files="$ac_config_files INSTALL"
-
-          ac_config_files="$ac_config_files bibletime.lsm"
-
-          ac_config_files="$ac_config_files bibletime.spec"
-
-          ac_config_files="$ac_config_files bibletime.desktop"
-
-
-
-DO_NOT_COMPILE="$DO_NOT_COMPILE CVS debian bsd-port admin"
-
-if test ! -s $srcdir/subdirs; then
-    TOPSUBDIRS=""
-  files=`cd $srcdir && ls -1`
-  dirs=`for i in $files; do if test -d $i; then echo $i; fi; done`
-  for i in $dirs; do
-    echo $i >> $srcdir/subdirs
-  done
-fi
-
-ac_topsubdirs=
-if test -s $srcdir/inst-apps; then
-  ac_topsubdirs="`cat $srcdir/inst-apps`"
-elif test -s $srcdir/subdirs; then
-  ac_topsubdirs="`cat $srcdir/subdirs`"
-fi
-
-for i in $ac_topsubdirs; do
-  echo "$as_me:$LINENO: checking if $i should be compiled" >&5
-echo $ECHO_N "checking if $i should be compiled... $ECHO_C" >&6
-  if test -d $srcdir/$i; then
-    install_it="yes"
-    for j in $DO_NOT_COMPILE; do
-      if test $i = $j; then
-        install_it="no"
-      fi
-    done
-  else
-    install_it="no"
-  fi
-  echo "$as_me:$LINENO: result: $install_it" >&5
-echo "${ECHO_T}$install_it" >&6
-  vari=`echo $i | sed -e 's,[-+.],_,g'`
-  if test $install_it = "yes"; then
-    TOPSUBDIRS="$TOPSUBDIRS $i"
-    eval "$vari""_SUBDIR_included=yes"
-  else
-    eval "$vari""_SUBDIR_included=no"
-  fi
-done
-
-
-
-          ac_config_files="$ac_config_files Makefile"
-
-          ac_config_files="$ac_config_files bibletime/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/backend/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/frontend/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/frontend/display/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/frontend/displaywindow/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/frontend/keychooser/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/frontend/mainindex/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/frontend/searchdialog/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/pics/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/pics/16x16/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/pics/22x22/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/pics/32x32/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/pics/48x48/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/pics/64x64/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/printing/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/util/Makefile"
-
-          ac_config_files="$ac_config_files bibletime/xml/Makefile"
-
-          ac_config_files="$ac_config_files docs/Makefile"
-
-          ac_config_files="$ac_config_files docs/handbook/Makefile"
-
-          ac_config_files="$ac_config_files docs/handbook/html/Makefile"
-
-          ac_config_files="$ac_config_files docs/handbook/unicode/Makefile"
-
-          ac_config_files="$ac_config_files docs/howto/Makefile"
-
-          ac_config_files="$ac_config_files docs/howto/html/Makefile"
-
-          ac_config_files="$ac_config_files docs/howto/unicode/Makefile"
-
-          ac_config_files="$ac_config_files pot/Makefile"
-
-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 : $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 "${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
-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 "${include_ARTS_TRUE}" && test -z "${include_ARTS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"include_ARTS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"include_ARTS\" 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
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/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 -n "`(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
-  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"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="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.57.  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.57,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-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.
-  "NEWS" ) CONFIG_FILES="$CONFIG_FILES NEWS" ;;
-  "README" ) CONFIG_FILES="$CONFIG_FILES README" ;;
-  "INSTALL" ) CONFIG_FILES="$CONFIG_FILES INSTALL" ;;
-  "bibletime.lsm" ) CONFIG_FILES="$CONFIG_FILES bibletime.lsm" ;;
-  "bibletime.spec" ) CONFIG_FILES="$CONFIG_FILES bibletime.spec" ;;
-  "bibletime.desktop" ) CONFIG_FILES="$CONFIG_FILES bibletime.desktop" ;;
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "bibletime/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/Makefile" ;;
-  "bibletime/backend/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/backend/Makefile" ;;
-  "bibletime/frontend/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/frontend/Makefile" ;;
-  "bibletime/frontend/display/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/frontend/display/Makefile" ;;
-  "bibletime/frontend/displaywindow/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/frontend/displaywindow/Makefile" ;;
-  "bibletime/frontend/keychooser/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/frontend/keychooser/Makefile" ;;
-  "bibletime/frontend/mainindex/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/frontend/mainindex/Makefile" ;;
-  "bibletime/frontend/searchdialog/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/frontend/searchdialog/Makefile" ;;
-  "bibletime/pics/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/pics/Makefile" ;;
-  "bibletime/pics/16x16/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/pics/16x16/Makefile" ;;
-  "bibletime/pics/22x22/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/pics/22x22/Makefile" ;;
-  "bibletime/pics/32x32/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/pics/32x32/Makefile" ;;
-  "bibletime/pics/48x48/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/pics/48x48/Makefile" ;;
-  "bibletime/pics/64x64/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/pics/64x64/Makefile" ;;
-  "bibletime/printing/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/printing/Makefile" ;;
-  "bibletime/util/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/util/Makefile" ;;
-  "bibletime/xml/Makefile" ) CONFIG_FILES="$CONFIG_FILES bibletime/xml/Makefile" ;;
-  "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
-  "docs/handbook/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/handbook/Makefile" ;;
-  "docs/handbook/html/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/handbook/html/Makefile" ;;
-  "docs/handbook/unicode/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/handbook/unicode/Makefile" ;;
-  "docs/howto/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/howto/Makefile" ;;
-  "docs/howto/html/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/howto/html/Makefile" ;;
-  "docs/howto/unicode/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/howto/unicode/Makefile" ;;
-  "pot/Makefile" ) CONFIG_FILES="$CONFIG_FILES pot/Makefile" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS 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,@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,@target@,$target,;t t
-s,@target_cpu@,$target_cpu,;t t
-s,@target_vendor@,$target_vendor,;t t
-s,@target_os@,$target_os,;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,@AMTAR@,$AMTAR,;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,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@CONF_FILES@,$CONF_FILES,;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,@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,@WOVERLOADED_VIRTUAL@,$WOVERLOADED_VIRTUAL,;t t
-s,@USE_EXCEPTIONS@,$USE_EXCEPTIONS,;t t
-s,@USE_RTTI@,$USE_RTTI,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@NOOPT_CXXFLAGS@,$NOOPT_CXXFLAGS,;t t
-s,@NOOPT_CFLAGS@,$NOOPT_CFLAGS,;t t
-s,@KDE_USE_FINAL_TRUE@,$KDE_USE_FINAL_TRUE,;t t
-s,@KDE_USE_FINAL_FALSE@,$KDE_USE_FINAL_FALSE,;t t
-s,@KDE_USE_CLOSURE_TRUE@,$KDE_USE_CLOSURE_TRUE,;t t
-s,@KDE_USE_CLOSURE_FALSE@,$KDE_USE_CLOSURE_FALSE,;t t
-s,@KDE_NO_UNDEFINED@,$KDE_NO_UNDEFINED,;t t
-s,@KDE_USE_NMCHECK_TRUE@,$KDE_USE_NMCHECK_TRUE,;t t
-s,@KDE_USE_NMCHECK_FALSE@,$KDE_USE_NMCHECK_FALSE,;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,@F77@,$F77,;t t
-s,@FFLAGS@,$FFLAGS,;t t
-s,@ac_ct_F77@,$ac_ct_F77,;t t
-s,@LIBTOOL@,$LIBTOOL,;t t
-s,@KDE_PLUGIN@,$KDE_PLUGIN,;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,@MSGFMT@,$MSGFMT,;t t
-s,@GMSGFMT@,$GMSGFMT,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@LIBUTIL@,$LIBUTIL,;t t
-s,@LIBCOMPAT@,$LIBCOMPAT,;t t
-s,@LIBCRYPT@,$LIBCRYPT,;t t
-s,@LIBRESOLV@,$LIBRESOLV,;t t
-s,@LIB_POLL@,$LIB_POLL,;t t
-s,@FRAMEWORK_COREAUDIO@,$FRAMEWORK_COREAUDIO,;t t
-s,@LIBSOCKET@,$LIBSOCKET,;t t
-s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
-s,@LIBUCB@,$LIBUCB,;t t
-s,@LIBDL@,$LIBDL,;t t
-s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
-s,@LIB_X11@,$LIB_X11,;t t
-s,@LIB_XRENDER@,$LIB_XRENDER,;t t
-s,@LIBSM@,$LIBSM,;t t
-s,@X_INCLUDES@,$X_INCLUDES,;t t
-s,@X_LDFLAGS@,$X_LDFLAGS,;t t
-s,@x_includes@,$x_includes,;t t
-s,@x_libraries@,$x_libraries,;t t
-s,@QTE_NORTTI@,$QTE_NORTTI,;t t
-s,@LIB_XEXT@,$LIB_XEXT,;t t
-s,@LIBPTHREAD@,$LIBPTHREAD,;t t
-s,@USE_THREADS@,$USE_THREADS,;t t
-s,@KDE_MT_LDFLAGS@,$KDE_MT_LDFLAGS,;t t
-s,@KDE_MT_LIBS@,$KDE_MT_LIBS,;t t
-s,@USER_INCLUDES@,$USER_INCLUDES,;t t
-s,@USER_LDFLAGS@,$USER_LDFLAGS,;t t
-s,@LIBZ@,$LIBZ,;t t
-s,@LIBPNG@,$LIBPNG,;t t
-s,@LIBJPEG@,$LIBJPEG,;t t
-s,@qt_libraries@,$qt_libraries,;t t
-s,@qt_includes@,$qt_includes,;t t
-s,@QT_INCLUDES@,$QT_INCLUDES,;t t
-s,@QT_LDFLAGS@,$QT_LDFLAGS,;t t
-s,@PERL@,$PERL,;t t
-s,@MOC@,$MOC,;t t
-s,@UIC@,$UIC,;t t
-s,@UIC_TR@,$UIC_TR,;t t
-s,@LIB_QT@,$LIB_QT,;t t
-s,@LIB_QPE@,$LIB_QPE,;t t
-s,@kde_qtver@,$kde_qtver,;t t
-s,@KDE_EXTRA_RPATH@,$KDE_EXTRA_RPATH,;t t
-s,@KDE_RPATH@,$KDE_RPATH,;t t
-s,@X_RPATH@,$X_RPATH,;t t
-s,@kde_libraries@,$kde_libraries,;t t
-s,@kde_includes@,$kde_includes,;t t
-s,@KDE_LDFLAGS@,$KDE_LDFLAGS,;t t
-s,@KDE_INCLUDES@,$KDE_INCLUDES,;t t
-s,@all_includes@,$all_includes,;t t
-s,@all_libraries@,$all_libraries,;t t
-s,@AUTODIRS@,$AUTODIRS,;t t
-s,@include_ARTS_TRUE@,$include_ARTS_TRUE,;t t
-s,@include_ARTS_FALSE@,$include_ARTS_FALSE,;t t
-s,@KCONFIG_COMPILER@,$KCONFIG_COMPILER,;t t
-s,@KCFG_DEPENDENCIES@,$KCFG_DEPENDENCIES,;t t
-s,@DCOPIDLNG@,$DCOPIDLNG,;t t
-s,@DCOPIDL@,$DCOPIDL,;t t
-s,@DCOPIDL2CPP@,$DCOPIDL2CPP,;t t
-s,@DCOP_DEPENDENCIES@,$DCOP_DEPENDENCIES,;t t
-s,@MCOPIDL@,$MCOPIDL,;t t
-s,@ARTSCCONFIG@,$ARTSCCONFIG,;t t
-s,@KDECONFIG@,$KDECONFIG,;t t
-s,@MEINPROC@,$MEINPROC,;t t
-s,@KDE_XSL_STYLESHEET@,$KDE_XSL_STYLESHEET,;t t
-s,@XMLLINT@,$XMLLINT,;t t
-s,@kde_libs_prefix@,$kde_libs_prefix,;t t
-s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-s,@kde_htmldir@,$kde_htmldir,;t t
-s,@kde_appsdir@,$kde_appsdir,;t t
-s,@kde_icondir@,$kde_icondir,;t t
-s,@kde_sounddir@,$kde_sounddir,;t t
-s,@kde_datadir@,$kde_datadir,;t t
-s,@kde_locale@,$kde_locale,;t t
-s,@kde_confdir@,$kde_confdir,;t t
-s,@kde_kcfgdir@,$kde_kcfgdir,;t t
-s,@kde_mimedir@,$kde_mimedir,;t t
-s,@kde_wallpaperdir@,$kde_wallpaperdir,;t t
-s,@kde_bindir@,$kde_bindir,;t t
-s,@xdg_appsdir@,$xdg_appsdir,;t t
-s,@xdg_menudir@,$xdg_menudir,;t t
-s,@xdg_directorydir@,$xdg_directorydir,;t t
-s,@kde_templatesdir@,$kde_templatesdir,;t t
-s,@kde_servicesdir@,$kde_servicesdir,;t t
-s,@kde_servicetypesdir@,$kde_servicetypesdir,;t t
-s,@kde_moduledir@,$kde_moduledir,;t t
-s,@kdeinitdir@,$kdeinitdir,;t t
-s,@kde_styledir@,$kde_styledir,;t t
-s,@kde_widgetdir@,$kde_widgetdir,;t t
-s,@LIB_KDECORE@,$LIB_KDECORE,;t t
-s,@LIB_KDEUI@,$LIB_KDEUI,;t t
-s,@LIB_KIO@,$LIB_KIO,;t t
-s,@LIB_SMB@,$LIB_SMB,;t t
-s,@LIB_KAB@,$LIB_KAB,;t t
-s,@LIB_KABC@,$LIB_KABC,;t t
-s,@LIB_KHTML@,$LIB_KHTML,;t t
-s,@LIB_KSPELL@,$LIB_KSPELL,;t t
-s,@LIB_KPARTS@,$LIB_KPARTS,;t t
-s,@LIB_KDEPRINT@,$LIB_KDEPRINT,;t t
-s,@LIB_KUTILS@,$LIB_KUTILS,;t t
-s,@LIB_KDEPIM@,$LIB_KDEPIM,;t t
-s,@LIB_KSYCOCA@,$LIB_KSYCOCA,;t t
-s,@LIB_KFILE@,$LIB_KFILE,;t t
-s,@LIB_KFM@,$LIB_KFM,;t t
-s,@BT_LDFLAGS@,$BT_LDFLAGS,;t t
-s,@SWORD_LIBRARY_PATH@,$SWORD_LIBRARY_PATH,;t t
-s,@LIB_SWORD@,$LIB_SWORD,;t t
-s,@SWORD_INCLUDES@,$SWORD_INCLUDES,;t t
-s,@DISTRIBUTION@,$DISTRIBUTION,;t t
-s,@DISTRIBUTION_VERSION@,$DISTRIBUTION_VERSION,;t t
-s,@RPM_PREFIX@,$RPM_PREFIX,;t t
-s,@RPM_GROUP@,$RPM_GROUP,;t t
-s,@TOPSUBDIRS@,$TOPSUBDIRS,;t t
-s,@LIBOBJS@,$LIBOBJS,;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
-# 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`
-
-
-  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; }; }
-         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'`
-  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
-# 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`
-
-
-  { 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
-  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n -e '/^U = / s///p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # 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 -e '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //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
-if test "x$with_fast_perl" = "xyes"; then    
-  perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS    \
-    || mv $CONFIG_STATUS.bak $CONFIG_STATUS    
-  rm -f $CONFIG_STATUS.bak
-fi    
-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
-
-if test "$all_tests" = "bad"; then
-  if test ! "$cache_file" = "/dev/null"; then
-    echo ""
-    echo "Please remove the file $cache_file after changing your setup"
-    echo "so that configure will find the changes next time."
-    echo ""
-  fi
-else
-  echo ""
-  echo "Good - your configure finished. Start make now"
-  echo ""
-fi
diff --git a/configure.files b/configure.files
deleted file mode 100644
index 1083352..0000000
--- a/configure.files
+++ /dev/null
@@ -1 +0,0 @@
-configure.in.in
diff --git a/configure.in b/configure.in
deleted file mode 100644
index a64c322..0000000
--- a/configure.in
+++ /dev/null
@@ -1,100 +0,0 @@
-dnl =======================================================
-dnl FILE: configure.in.in
-dnl =======================================================
-
-AC_INIT(acinclude.m4) dnl a source file from your sub dir
-
-dnl This is so we can use kde-common
-AC_CONFIG_AUX_DIR(admin)
-
-dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
-unset CDPATH
-
-dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM
-dnl Perform program name transformation
-AC_ARG_PROGRAM
-
-dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(bibletime, 1.4.1) dnl searches for some needed programs
-
-KDE_SET_PREFIX
-KDE_USE_QT(3.0)
-
-dnl generate the config header
-AM_CONFIG_HEADER([config.h]) dnl at the distribution this done
-
-dnl Checks for programs.
-AC_CHECK_COMPILERS
-AC_ENABLE_SHARED(no)
-AC_ENABLE_STATIC(yes)
-KDE_PROG_LIBTOOL
-
-AM_MAINTAINER_MODE
-
-dnl for NLS support. Call them in this order!
-dnl WITH_NLS is for the po files
-AM_KDE_WITH_NLS
-
-AC_PATH_KDE
-
-dnl in this space add everything you want to check for;
-dnl examples are specific headers, libraries, etc.
-dnl everything to compile and run a KDE program is already checked
-
-CPPFLAGS="$CPPFLAGS -DQT_NO_ASCII_CAST -DQT_NO_COMPAT -DQT_CLEAN_NAMESPACE -Wall -I\$(top_srcdir)/ -I\$(top_srcdir)/bibletime"
-AC_CHECK_STATIC_LINKING(ac_use_static)
-AC_CHECK_SWORD(1.5.7, [$ac_use_static])
-AC_CHECK_CURL()
-
-dnl Chek for the used distribution
-AC_CHECK_DISTRIBUTION
-
-dnl add here all your Makefiles. They are created by configure
-
-AC_CONFIG_FILES([ NEWS ])
-AC_CONFIG_FILES([ README ])
-AC_CONFIG_FILES([ INSTALL ])
-AC_CONFIG_FILES([ bibletime.lsm ])
-AC_CONFIG_FILES([ bibletime.spec ])
-AC_CONFIG_FILES([ bibletime.desktop ])
-KDE_CREATE_SUBDIRSLIST
-AC_CONFIG_FILES([ Makefile ])
-AC_CONFIG_FILES([ bibletime/Makefile ])
-AC_CONFIG_FILES([ bibletime/backend/Makefile ])
-AC_CONFIG_FILES([ bibletime/frontend/Makefile ])
-AC_CONFIG_FILES([ bibletime/frontend/display/Makefile ])
-AC_CONFIG_FILES([ bibletime/frontend/displaywindow/Makefile ])
-AC_CONFIG_FILES([ bibletime/frontend/keychooser/Makefile ])
-AC_CONFIG_FILES([ bibletime/frontend/mainindex/Makefile ])
-AC_CONFIG_FILES([ bibletime/frontend/searchdialog/Makefile ])
-AC_CONFIG_FILES([ bibletime/pics/Makefile ])
-AC_CONFIG_FILES([ bibletime/pics/16x16/Makefile ])
-AC_CONFIG_FILES([ bibletime/pics/22x22/Makefile ])
-AC_CONFIG_FILES([ bibletime/pics/32x32/Makefile ])
-AC_CONFIG_FILES([ bibletime/pics/48x48/Makefile ])
-AC_CONFIG_FILES([ bibletime/pics/64x64/Makefile ])
-AC_CONFIG_FILES([ bibletime/printing/Makefile ])
-AC_CONFIG_FILES([ bibletime/util/Makefile ])
-AC_CONFIG_FILES([ bibletime/xml/Makefile ])
-AC_CONFIG_FILES([ docs/Makefile ])
-AC_CONFIG_FILES([ docs/handbook/Makefile ])
-AC_CONFIG_FILES([ docs/handbook/html/Makefile ])
-AC_CONFIG_FILES([ docs/handbook/unicode/Makefile ])
-AC_CONFIG_FILES([ docs/howto/Makefile ])
-AC_CONFIG_FILES([ docs/howto/html/Makefile ])
-AC_CONFIG_FILES([ docs/howto/unicode/Makefile ])
-AC_CONFIG_FILES([ pot/Makefile ])
-AC_OUTPUT
-if test "$all_tests" = "bad"; then
-  if test ! "$cache_file" = "/dev/null"; then
-    echo ""    
-    echo "Please remove the file $cache_file after changing your setup"
-    echo "so that configure will find the changes next time."
-    echo ""
-  fi
-else
-  echo ""
-  echo "Good - your configure finished. Start make now"
-  echo ""
-fi
diff --git a/configure.in.in b/configure.in.in
deleted file mode 100644
index 2f067b9..0000000
--- a/configure.in.in
+++ /dev/null
@@ -1,56 +0,0 @@
-AC_INIT(acinclude.m4) dnl a source file from your sub dir
-
-dnl This is so we can use kde-common
-AC_CONFIG_AUX_DIR(admin)
-
-dnl This ksh/zsh feature conflicts with `cd blah ; pwd`
-unset CDPATH
-
-dnl Checking host/target/build systems, for make, install etc.
-AC_CANONICAL_SYSTEM
-dnl Perform program name transformation
-AC_ARG_PROGRAM
-
-dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(bibletime, 1.4.1) dnl searches for some needed programs
-
-KDE_SET_PREFIX
-KDE_USE_QT(3.0)
-
-dnl generate the config header
-AM_CONFIG_HEADER([config.h]) dnl at the distribution this done
-
-dnl Checks for programs.
-AC_CHECK_COMPILERS
-AC_ENABLE_SHARED(no)
-AC_ENABLE_STATIC(yes)
-KDE_PROG_LIBTOOL
-
-AM_MAINTAINER_MODE
-
-dnl for NLS support. Call them in this order!
-dnl WITH_NLS is for the po files
-AM_KDE_WITH_NLS
-
-AC_PATH_KDE
-
-dnl in this space add everything you want to check for;
-dnl examples are specific headers, libraries, etc.
-dnl everything to compile and run a KDE program is already checked
-
-CPPFLAGS="$CPPFLAGS -DQT_NO_ASCII_CAST -DQT_NO_COMPAT -DQT_CLEAN_NAMESPACE -Wall -I\$(top_srcdir)/ -I\$(top_srcdir)/bibletime"
-AC_CHECK_STATIC_LINKING(ac_use_static)
-AC_CHECK_SWORD(1.5.7, [$ac_use_static])
-AC_CHECK_CURL()
-
-dnl Chek for the used distribution
-AC_CHECK_DISTRIBUTION
-
-dnl add here all your Makefiles. They are created by configure
-
-AC_CONFIG_FILES([ NEWS ])
-AC_CONFIG_FILES([ README ])
-AC_CONFIG_FILES([ INSTALL ])
-AC_CONFIG_FILES([ bibletime.lsm ])
-AC_CONFIG_FILES([ bibletime.spec ])
-AC_CONFIG_FILES([ bibletime.desktop ])
diff --git a/debian/Makefile.am b/debian/Makefile.am
deleted file mode 100644
index e0134b8..0000000
--- a/debian/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-btdebdir = $(top_srcdir)/debian
-
-EXTRA_DIST += $(btdebdir)/bibletime.xpm
-EXTRA_DIST += $(btdebdir)/changelog
-EXTRA_DIST += $(btdebdir)/control
-EXTRA_DIST += $(btdebdir)/copyright
-EXTRA_DIST += $(btdebdir)/dirs
-EXTRA_DIST += $(btdebdir)/docs
-EXTRA_DIST += $(btdebdir)/menu
-EXTRA_DIST += $(btdebdir)/override
-EXTRA_DIST += $(btdebdir)/rules
diff --git a/debian/bibletime.xpm b/debian/bibletime.xpm
deleted file mode 100644
index 6d7b951..0000000
--- a/debian/bibletime.xpm
+++ /dev/null
@@ -1,59 +0,0 @@
-/* XPM */
-static char * bibletime_xpm[] = {
-"32 32 24 1",
-" 	c None",
-".	c #C3C3C3",
-"+	c #303030",
-"@	c #A0A0A0",
-"#	c #C05800",
-"$	c #000000",
-"%	c #FFA858",
-"&	c #404000",
-"*	c #FFDCA8",
-"=	c #FFC0C0",
-"-	c #DCDCDC",
-";	c #585858",
-">	c #808080",
-",	c #800000",
-"'	c #400000",
-")	c #FF8000",
-"!	c #800080",
-"~	c #C0C000",
-"{	c #C000C0",
-"]	c #C00000",
-"^	c #FFFFC0",
-"/	c #FF0000",
-"(	c #C0FFC0",
-"_	c #808000",
-"                                ",
-"               ; ;              ",
-"      +$$+++$+++&+++++$$        ",
-"     '&,'@@@.%.%..===.*+;       ",
-"     +!&+@%%.@#@%~...=-&$       ",
-"     +,!&@%%@###@@..%*.&&       ",
-"     &!,+@@@%@{#@.%..=*&+       ",
-"     ,;&,@%)>##{###)@.=;$       ",
-"    ;+,!+@%##{##]{##)=.;$       ",
-"     &,!&@%)@###%%@=.=-&+       ",
-"    ;&,,+.@%@%##.%.%..*+&       ",
-"     ,&&,@..%%##.%.=.*-+&       ",
-"     +,,&@%..%>#=...=.=+&       ",
-"     +,!&@=...@#@...*-.++       ",
-"     &!,+~....)#).*.-*-+$       ",
-"     &!,+@..=.##)*..**-&$       ",
-"     +,,&@=.*.##@.=*..*&$       ",
-"     +,,&@==..%%..*.**.++       ",
-"     &,!+@..*...*=..-*-+$       ",
-"     ,&+&_.*..*...**-=.++       ",
-"     &!!&>%..@>&++'++$+$$       ",
-"     $'$$++'$++;>)>@)=..@       ",
-"     $$+&#>)>@%%@@%..*--        ",
-"     $;>#)@@%%..==..--**        ",
-"     $##;>@@@%@.~...*-**        ",
-"     +$;;#>>%%@~....**-^        ",
-"     @+'$&#>@)>@~.~..--^        ",
-"         >++$$$+$'++&>.-.       ",
-"               @>;&'+$+$;       ",
-"                                ",
-"                                ",
-"                                "};
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index f1261c7..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,141 +0,0 @@
-bibletime (1.4-1) unstable; urgency=low
-
-  * New upstream version
-  * depend on sword 1.5.7
-
- -- Daniel Glassey <wdg@debian.org>  Thu,  8 Jan 2004 11:50:46 +0000
-
-bibletime (1.3-3) unstable; urgency=low
-
-  * Fix copyright file
-  * Acknowledge NMU, thanks, Closes: #187033
-
- -- Daniel Glassey <wdg@debian.org>  Tue, 16 Dec 2003 22:40:52 +0000
-
-bibletime (1.3-2) unstable; urgency=medium
-
-  * Build Depend on sword >= 1.5.6-9
-  * Time to upload to unstable
-  * Standards version now 3.6.1.0
-
- -- Daniel Glassey <wdg@debian.org>  Wed, 12 Nov 2003 17:59:31 +0000
-
-bibletime (1.3-1) experimental; urgency=low
-
-  * 1.3 is released :)
-  * depend on sword 1.5.6
-  * Upload to experimental for now
-
- -- Daniel Glassey <wdg@debian.org>  Thu, 28 Aug 2003 15:29:45 +0100
-
-bibletime (1.2.99-2) unstable; urgency=low
-
-  * rebuild against not quite released sword1.5.5.99-3
-
- -- Daniel Glassey <wdg@debian.org>  Fri, 18 Jul 2003 18:39:40 +0100
-
-bibletime (1.2.99-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Daniel Glassey <wdg@debian.org>  Fri,  13 Jul 2003 21:33:55 +0100
-
-bibletime (1.0.99b-1) unstable; urgency=low
-
-  * New upstream release
-
- -- Daniel Glassey <wdg@debian.org>  Tue,  2 Apr 2002 21:33:55 +0100
-
-bibletime (1.0.3-1) unstable; urgency=low
-
-  * New upstream release
-  * build against autotooled sword
-  * correct spelling error, Closes: #124449
-  * not uploading til sword 1.5.2-8 is in
-  * bulid depend on sword >=1.5.2-9
-
- -- Daniel Glassey <wdg@debian.org>  Fri,  1 Feb 2002 23:01:55 +0000
-
-bibletime (1.0.2-2) unstable; urgency=low
-
-  * Remove debian/controly which shouldn't be there 
-  * stop configure from being run twice to fix alpha build, Closes: #121674
-  * build-depend on kdelibs-dev >= 2.2.2-8 to catch libfam-dev dependency, see bug 124264
-  * Update description for bibletime 1.0.2
-  * Update to policy version 3.5.6.0, no necessary changes noticed yet
-  * modify clean target in debian/rules to use clean instead of distclean
-      and remove */Makefile and */*.moc.cpp 
-
- -- Daniel Glassey <wdg@debian.org>  Sat, 15 Dec 2001 21:40:18 +0000
-
-bibletime (1.0.2-1) unstable; urgency=low
-
-  * New upstream release - see www.bibletime.de for changes
-  * Using latest config.sub and config.guess, Closes #105779
-  * may compile on ia64 now (cswordbackendmanager.* does not exist now), Closes #110187
-  * Change maintainer to wdg@debian.org
-  * Depend on sword >= 1.5.2-4 (new libsword1 shlibs)
-  * use AM_MAINTAINER_MODE in configure.in - try to stop automake etc
-      from running while building
-      so don't build depend on automake, autoconf
-  * fixes for alpha compilation in debian/rules, Closes: #121674
-  * .xvpics has been removed from source, Closes: #112706
-  * in debian/rules use dh_compress -X to stop tipsdatabase from being installed compressed, Closes #110847
-
- -- Daniel Glassey <wdg@debian.org>  Fri, 30 Nov 2001 19:41:44 +0000
-
-bibletime (1.0.1-1) unstable; urgency=low
-
-  * New upstream release - see www.bibletime.de for changes
-  * patched bibletime/pics/Makefile.am to allow install to $DESTDIR
-  * removed AUTHORS from debian/docs
-
- -- Daniel Glassey <wdg@debian.org>  Sat, 25 Aug 2001 13:47:36 +0000
-
-bibletime (1.0-1) unstable; urgency=low
-
-  * New upstream release - see www.bibletime.de for changes
-
- -- Daniel Glassey <wdg@debian.org>  Mon, 25 Jun 2001 22:22:30 +0000
-
-bibletime (0.31-3.1) unstable; urgency=low
-
-  * Non-maintainer upload (Ben Burton <benb@acm.org>).
-  * Rebuilt with new Qt libs (closes: #89789).
-  * Build-Depends: Replaced kdebase-dev with kdelibs-dev; removed
-    autoconf (redundant); added libtool.
-  * Replaced admin/debianrules with a newer version and modified
-    debian/rules to use admin/debianrules; this way everything gets
-    installed into the correct directory; this also required modifying
-    $(localedir) in po/Makefile.am.
-  * Added debian menu item, lintian overrides file and doc-base registration.
-  * In debian/rules, using configure-stamp instead of configure.stamp
-    (this stops ./configure being run again and again and again).
-  * In debian/rules, deletes Makefile.ins on "make clean" and recreates
-    them during "make configure"; this removes some unnecessary junk
-    from the debian diff.gz file.
-
- -- Ben Burton <benb@acm.org>  Thu, 17 May 2001 13:02:11 -0500
-
-bibletime (0.31-3) unstable; urgency=low
-
-  * Standards version now 3.2.1
-  * Added build-depends
-
- -- Daniel Glassey <danglassey@yahoo.com>  Mon, 22 Jan 2001 22:19:43 +0000
-
-bibletime (0.31-2) unstable; urgency=low
-
-  * Add dependencies on modules.
-
- -- Daniel Glassey <danglassey@yahoo.com>  Mon,  4 Dec 2000 22:34:34 +0000
-
-bibletime (0.31-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Daniel Glassey <danglassey@yahoo.com>  Thu, 23 Nov 2000 20:57:31 +0000
-
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/control b/debian/control
deleted file mode 100644
index cef578e..0000000
--- a/debian/control
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: bibletime
-Section: kde
-Build-Depends: debhelper, kdelibs4-dev, libsword-dev (>= 1.5.7-1), libsword-dev (<< 1.5.7.90-1)
-Priority: optional
-Maintainer: Daniel Glassey <wdg@debian.org>
-Standards-Version: 3.6.1.0
-
-Package: bibletime
-Architecture: any
-Section: kde
-Depends: ${shlibs:Depends}
-Recommends: sword-text, sword-dict, sword-comm
-Provides: sword-frontend
-Description: A bible study tool for KDE
- BibleTime is a free and easy to use bible study tool for UNIX systems.
- It requires a working KDE environment and the SWORD library.
- BibleTime provides easy handling of digitized texts (Bibles, commentaries
- and lexicons) and powerful features to work with these texts (search in
- texts, write own notes, save, print etc.).
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index ea5a23c..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-This package was initially debianized by 
-Daniel Glassey <danglassey@yahoo.com> on
-Thu, 23 Nov 2000 20:57:31 +0000.
-
-It was downloaded from www.bibletime.de
-
-Upstream Author(s): Bibletime team <info@bibletime.info>
-
-Copyright 1999-2003 BibleTime team <info@bibletime.info>
-
-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.
-
-On Debian systems, the complete text of the GNU General Public
-License, version 2, can be found in /usr/share/common-licenses/GPL-2
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 98d1583..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/man/man1
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 50bd824..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-NEWS
-README
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index 153b74b..0000000
--- a/debian/menu
+++ /dev/null
@@ -1,8 +0,0 @@
-?package(bibletime):\
-    needs=X11\
-    hints="KDE"\
-	kderemove="1"\
-    section=Apps/Tools\
-    title="BibleTime"\
-    icon="/usr/share/pixmaps/bibletime.xpm"\
-    command=/usr/bin/bibletime
diff --git a/debian/override b/debian/override
deleted file mode 100644
index 817f074..0000000
--- a/debian/override
+++ /dev/null
@@ -1,2 +0,0 @@
-# This tag is required for apps already in the KDE menu.
-bibletime: menu-item-contains-unknown-tag kderemove /usr/lib/menu/bibletime:8
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 606772b..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This is the debhelper compatability version to use.
-#export DH_COMPAT=1
-
-ARCH = $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-ifeq ($(ARCH),alpha)
-	COMPILER_FLAGS=CFLAGS="-O0 -mieee" CXXFLAGS="-O0 -mieee"
-endif
-
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	#automake
-	#perl am_edit
-	$(COMPILER_FLAGS) ./configure $(configkde) --disable-maintainer-mode
-	touch configure-stamp
-
-build: configure build-stamp
-build-stamp:
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(COMPILER_FLAGS) $(MAKE)
-
-	touch build-stamp
-
-clean: 
-	dh_testdir
-	dh_testroot
-	#perl am_edit
-	rm -f build-stamp configure-stamp
-	-rm -f debian/debiandirs
-
-	# Add here commands to clean up after the build process.
-	#-$(MAKE) distclean
-	-$(MAKE) clean
-
-	#-rm -f `find . -name Makefile.in`
-	-rm -f `find . -name Makefile`
-	-rm -f `find . -name *.moc.cpp`
-	-rm -f `find . -name *_meta_unload.cpp`
-	-rm subdirs configure.files config.cache config.log config.status
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp.
-	#$(MAKE) install DESTDIR=`pwd`/debian/tmp kde_htmldir=`pwd`/debian/tmp/usr/share/doc/kde/HTML
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp
-
-	# Install the pixmap for the debian menu item.
-	install -p -d -o root -g root -m 755 \
-		`pwd`/debian/tmp/usr/share/pixmaps
-	install -p -o root -g root -m 644 debian/bibletime.xpm \
-		`pwd`/debian/tmp/usr/share/pixmaps
-
-	# Install the lintian overrides file.
-	install -p -d -o root -g root -m 755 \
-		`pwd`/debian/tmp/usr/share/lintian/overrides
-	install -p -o root -g root -m 644 debian/override \
-		`pwd`/debian/tmp/usr/share/lintian/overrides/bibletime
-
-	#temporary fix to stop things from being executable that shouldn't be?
-	chmod 644 debian/tmp/usr/share/apps/bibletime/pics/*
-	#chmod 644 debian/tmp/usr/share/apps/bibletime/printing/*
-	chmod 644 debian/tmp/usr/share/apps/bibletime/bibletimeui.rc
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-#	dh_testversion
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf	
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installinit
-	dh_installcron
-#	dh_installmanpages
-#	dh_installinfo
-	dh_undocumented
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip
-	dh_compress -Xtipdatabase
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index dd9b133..0000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-SUBDIRS = handbook howto 
-
-EXTRA_DIST =  tips
-
-rcdir = $(kde_datadir)/bibletime
-rc_DATA = tips
diff --git a/docs/Makefile.in b/docs/Makefile.in
deleted file mode 100644
index 35b3e64..0000000
--- a/docs/Makefile.in
+++ /dev/null
@@ -1,679 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-SUBDIRS = handbook howto 
-
-EXTRA_DIST = tips
-
-rcdir = $(kde_datadir)/bibletime
-rc_DATA = tips
-subdir = docs
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DATA = $(rc_DATA)
-
-
-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
-#>- 	all-recursive install-data-recursive install-exec-recursive \
-#>- 	installdirs-recursive install-recursive uninstall-recursive \
-#>- 	check-recursive installcheck-recursive
-#>+ 5
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-#>- all: all-recursive
-#>+ 1
-all: docs-am  all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-rcDATA_INSTALL = $(INSTALL_DATA)
-install-rcDATA: $(rc_DATA)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(rcdir)
-	@list='$(rc_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f"; \
-	  $(rcDATA_INSTALL) $$d$$p $(DESTDIR)$(rcdir)/$$f; \
-	done
-
-uninstall-rcDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(rc_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " rm -f $(DESTDIR)$(rcdir)/$$f"; \
-	  rm -f $(DESTDIR)$(rcdir)/$$f; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (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.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	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; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	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
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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-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; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	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)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-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 GTAGS GRTAGS GSYMS GPATH tags
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA)
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(rcdir)
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-rcDATA
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-rcDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-rcDATA install-recursive install-strip installcheck \
-	installcheck-am installdirs installdirs-am \
-	installdirs-recursive maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-rcDATA uninstall-recursive
-
-# 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:
-
-#>+ 2
-KDE_DIST=ksgmltools-bug-read-me.txt 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/docs/handbook/Makefile.am b/docs/handbook/Makefile.am
deleted file mode 100644
index 7e4ac2a..0000000
--- a/docs/handbook/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-SUBDIRS = unicode html
-html-files:
-	if test -e unicode/index.docbook; then \
-		olddir=$$PWD; \
-		cd html;\
-		echo "Validating the XML files..."; \
-		if meinproc ../unicode/index.docbook; then\
-			echo "HTML files created successfully."; \
-		fi; cd $$olddir; \
-	fi;
-
diff --git a/docs/handbook/Makefile.in b/docs/handbook/Makefile.in
deleted file mode 100644
index 60a9d09..0000000
--- a/docs/handbook/Makefile.in
+++ /dev/null
@@ -1,657 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-SUBDIRS = unicode html
-subdir = docs/handbook
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
-#>- 	all-recursive install-data-recursive install-exec-recursive \
-#>- 	installdirs-recursive install-recursive uninstall-recursive \
-#>- 	check-recursive installcheck-recursive
-#>+ 5
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-#>- all: all-recursive
-#>+ 1
-all: docs-am  all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/handbook/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/handbook/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/handbook/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-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.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (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.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	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; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	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
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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-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; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	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)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-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 GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-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
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
-
-html-files:
-	if test -e unicode/index.docbook; then \
-		olddir=$$PWD; \
-		cd html;\
-		echo "Validating the XML files..."; \
-		if meinproc ../unicode/index.docbook; then\
-			echo "HTML files created successfully."; \
-		fi; cd $$olddir; \
-	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:
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/handbook/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/handbook/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/docs/handbook/html/Makefile.am b/docs/handbook/html/Makefile.am
deleted file mode 100644
index 238a42b..0000000
--- a/docs/handbook/html/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = configure.png contents.png editdelete.png exit.png fileclose.png fileprint.png find.png go.png hdbk-bars-toolbar-Configtoolbar.png hdbk-config-toolbar.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-inst-sources-installmgr.png hdbk-op-change-range.png hdbk-op-crch-dia-choose.png hdbk-op-delete-verse.png hdbk-op-module-select-1.png hdbk-op-module-select-2.png hdbk-op-module-tree-1.png hdbk-op-module-tree-bookmark-bookmarkandfolder.png hdbk-op-pencil.png hdbk-op-search-dialog-modsel.png hdbk-op-search-dialog-options.png hdbk-op-search-dialog-range.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hi32-action-bt_bible_add.png hi32-action-bt_bible.png hi32-action-bt_book_add.png hi32-action-bt_book.png hi32-action-bt_cascade_auto.png hi32-action-bt_cascade.png hi32-action-bt_commentary_add.png hi32-action-bt_commentary.png hi32-action-bt_displayconfig.png hi32-action-bt_lexicon_add.png hi32-action-bt_lexicon.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_sync.png hi32-action-bt_tile_auto.png hi32-action-bt_tile.png hi32-app-bibletime.png kcmfontinst.png key_bindings.png ktip.png pencil.png queue.png start.png view_sidetree.png window_fullscreen.png 
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  configure.png contents.png editdelete.png exit.png fileclose.png fileprint.png find.png go.png hdbk-bars-toolbar-Configtoolbar.png hdbk-config-toolbar.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-inst-sources-installmgr.png hdbk-op-change-range.png hdbk-op-crch-dia-choose.png hdbk-op-delete-verse.png hdbk-op-module-select-1.png hdbk-op-module-select-2.png hdbk-op-module-tree-1.png hdbk-op-module-tree-bookmark-bookmarkandfolder.png hdbk-op-pencil.png hdbk-op-search-dialog-modsel.png hdbk-op-search-dialog-options.png hdbk-op-search-dialog-range.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hi32-action-bt_bible_add.png hi32-action-bt_bible.png hi32-action-bt_book_add.png hi32-action-bt_book.png hi32-action-bt_cascade_auto.png hi32-action-bt_cascade.png hi32-action-bt_commentary_add.png hi32-action-bt_commentary.png hi32-action-bt_displayconfig.png hi32-action-bt_lexicon_add.png hi32-action-bt_lexicon.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_sync.png hi32-action-bt_tile_auto.png hi32-action-bt_tile.png hi32-app-bibletime.png kcmfontinst.png key_bindings.png ktip.png pencil.png queue.png start.png view_sidetree.png window_fullscreen.png; do \
-	  $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook; \
-	  chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	done;
-	ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;\
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  configure.png contents.png editdelete.png exit.png fileclose.png fileprint.png find.png go.png hdbk-bars-toolbar-Configtoolbar.png hdbk-config-toolbar.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-inst-sources-installmgr.png hdbk-op-change-range.png hdbk-op-crch-dia-choose.png hdbk-op-delete-verse.png hdbk-op-module-select-1.png hdbk-op-module-select-2.png hdbk-op-module-tree-1.png hdbk-op-module-tree-bookmark-bookmarkandfolder.png hdbk-op-pencil.png hdbk-op-search-dialog-modsel.png hdbk-op-search-dialog-options.png hdbk-op-search-dialog-range.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hi32-action-bt_bible_add.png hi32-action-bt_bible.png hi32-action-bt_book_add.png hi32-action-bt_book.png hi32-action-bt_cascade_auto.png hi32-action-bt_cascade.png hi32-action-bt_commentary_add.png hi32-action-bt_commentary.png hi32-action-bt_displayconfig.png hi32-action-bt_lexicon_add.png hi32-action-bt_lexicon.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_sync.png hi32-action-bt_tile_auto.png hi32-action-bt_tile.png hi32-app-bibletime.png kcmfontinst.png key_bindings.png ktip.png pencil.png queue.png start.png view_sidetree.png window_fullscreen.png; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;
diff --git a/docs/handbook/html/Makefile.in b/docs/handbook/html/Makefile.in
deleted file mode 100644
index 84b95f3..0000000
--- a/docs/handbook/html/Makefile.in
+++ /dev/null
@@ -1,516 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = configure.png contents.png editdelete.png exit.png fileclose.png fileprint.png find.png go.png hdbk-bars-toolbar-Configtoolbar.png hdbk-config-toolbar.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-inst-sources-installmgr.png hdbk-op-change-range.png hdbk-op-crch-dia-choose.png hdbk-op-delete-verse.png hdbk-op-module-select-1.png hdbk-op-module-select-2.png hdbk-op-module-tree-1.png hdbk-op-module-tree-bookmark-bookmarkandfolder.png hdbk-op-pencil.png hdbk-op-search-dialog-modsel.png hdbk-op-search-dialog-options.png hdbk-op-search-dialog-range.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hi32-action-bt_bible_add.png hi32-action-bt_bible.png hi32-action-bt_book_add.png hi32-action-bt_book.png hi32-action-bt_cascade_auto.png hi32-action-bt_cascade.png hi32-action-bt_commentary_add.png hi32-action-bt_commentary.png hi32-action-bt_displayconfig.png hi32-action-bt_lexicon_add.png hi32-action-bt_lexicon.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_sync.png hi32-action-bt_tile_auto.png hi32-action-bt_tile.png hi32-app-bibletime.png kcmfontinst.png key_bindings.png ktip.png pencil.png queue.png start.png view_sidetree.png window_fullscreen.png 
-subdir = docs/handbook/html
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/handbook/html/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/handbook/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/handbook/html/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-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:
-
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-data-local 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 uninstall-local
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  configure.png contents.png editdelete.png exit.png fileclose.png fileprint.png find.png go.png hdbk-bars-toolbar-Configtoolbar.png hdbk-config-toolbar.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-inst-sources-installmgr.png hdbk-op-change-range.png hdbk-op-crch-dia-choose.png hdbk-op-delete-verse.png hdbk-op-module-select-1.png hdbk-op-module-select-2.png hdbk-op-module-tree-1.png hdbk-op-module-tree-bookmark-bookmarkandfolder.png hdbk-op-pencil.png hdbk-op-search-dialog-modsel.png hdbk-op-search-dialog-options.png hdbk-op-search-dialog-range.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hi32-action-bt_bible_add.png hi32-action-bt_bible.png hi32-action-bt_book_add.png hi32-action-bt_book.png hi32-action-bt_cascade_auto.png hi32-action-bt_cascade.png hi32-action-bt_commentary_add.png hi32-action-bt_commentary.png hi32-action-bt_displayconfig.png hi32-action-bt_lexicon_add.png hi32-action-bt_lexicon.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_sync.png hi32-action-bt_tile_auto.png hi32-action-bt_tile.png hi32-app-bibletime.png kcmfontinst.png key_bindings.png ktip.png pencil.png queue.png start.png view_sidetree.png window_fullscreen.png; do \
-	  $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook; \
-	  chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	done;
-	ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;\
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  configure.png contents.png editdelete.png exit.png fileclose.png fileprint.png find.png go.png hdbk-bars-toolbar-Configtoolbar.png hdbk-config-toolbar.png hdbk-conf-optdialog-color.png hdbk-conf-optdialog-fonts.png hdbk-conf-optdialog-start.png hdbk-conf-optdialog-sword.png hdbk-inst-sources-installmgr.png hdbk-op-change-range.png hdbk-op-crch-dia-choose.png hdbk-op-delete-verse.png hdbk-op-module-select-1.png hdbk-op-module-select-2.png hdbk-op-module-tree-1.png hdbk-op-module-tree-bookmark-bookmarkandfolder.png hdbk-op-pencil.png hdbk-op-search-dialog-modsel.png hdbk-op-search-dialog-options.png hdbk-op-search-dialog-range.png hdbk-op-search-dialog-searchanal.png hdbk-op-search-dialog-searchresult.png hdbk-op-search-dialog-searchtext.png hdbk-start-screen-terms.png hdbk-start-sequence-tips.png hi32-action-bt_bible_add.png hi32-action-bt_bible.png hi32-action-bt_book_add.png hi32-action-bt_book.png hi32-action-bt_cascade_auto.png hi32-action-bt_cascade.png hi32-action-bt_commentary_add.png hi32-action-bt_commentary.png hi32-action-bt_displayconfig.png hi32-action-bt_lexicon_add.png hi32-action-bt_lexicon.png hi32-action-bt_startconfig.png hi32-action-bt_swordconfig.png hi32-action-bt_sync.png hi32-action-bt_tile_auto.png hi32-action-bt_tile.png hi32-app-bibletime.png kcmfontinst.png key_bindings.png ktip.png pencil.png queue.png start.png view_sidetree.png window_fullscreen.png; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;
-# 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:
-
-#>+ 2
-KDE_DIST=hdbk-intro.html hdbk-start-screen.html hdbk-bars-menubar-mainindex.html hdbk-config-bt-sword.html hdbk-config-bt-Colors.html hdbk-bars-menubar-file.html hdbk-bars-menubar-Help.html hdbk-bars-menubar-Window.html hdbk-op-search-dialog-text-regexp.html hdbk-intro-ToDo.html hdbk-op.html hdbk-op-output.html hdbk-bars-toolbar-action.html hdbk-config-bt.html hdbk-op-MDI-Window.html hdbk-bars.html index.html hdbk-config-bt-profiles.html hdbk-intro-motivation.html hdbk-start-custom.html hdbk-config.html hdbk-bars-menubar-view.html hdbk-bars-menubar-settings.html hdbk-start-sequence.html hdbk-term.html hdbk-config-bt-Accelerators.html hdbk-op-module-tree-select.html hdbk-op-search.html hdbk-bars-menubar.html 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/handbook/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/handbook/html/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/docs/handbook/html/configure.png b/docs/handbook/html/configure.png
deleted file mode 100644
index 02ae367..0000000
--- a/docs/handbook/html/configure.png
+++ /dev/null
diff --git a/docs/handbook/html/contents.png b/docs/handbook/html/contents.png
deleted file mode 100644
index b9987fb..0000000
--- a/docs/handbook/html/contents.png
+++ /dev/null
diff --git a/docs/handbook/html/editdelete.png b/docs/handbook/html/editdelete.png
deleted file mode 100644
index fb04ace..0000000
--- a/docs/handbook/html/editdelete.png
+++ /dev/null
diff --git a/docs/handbook/html/exit.png b/docs/handbook/html/exit.png
deleted file mode 100644
index 4877f19..0000000
--- a/docs/handbook/html/exit.png
+++ /dev/null
diff --git a/docs/handbook/html/fileclose.png b/docs/handbook/html/fileclose.png
deleted file mode 100644
index 2b13d4a..0000000
--- a/docs/handbook/html/fileclose.png
+++ /dev/null
diff --git a/docs/handbook/html/fileprint.png b/docs/handbook/html/fileprint.png
deleted file mode 100644
index 669b738..0000000
--- a/docs/handbook/html/fileprint.png
+++ /dev/null
diff --git a/docs/handbook/html/find.png b/docs/handbook/html/find.png
deleted file mode 100644
index e752f04..0000000
--- a/docs/handbook/html/find.png
+++ /dev/null
diff --git a/docs/handbook/html/go.png b/docs/handbook/html/go.png
deleted file mode 100644
index 0d92fab..0000000
--- a/docs/handbook/html/go.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-bars-menubar-Help.html b/docs/handbook/html/hdbk-bars-menubar-Help.html
deleted file mode 100644
index 1ab2752..0000000
--- a/docs/handbook/html/hdbk-bars-menubar-Help.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html><head><title>Help</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Main toolbar and menubar"><link rel="previous" href="hdbk-bars-menubar-settings.html" title="Settings"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Help</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-bars-menubar-settings.html">Prev</a></td><td align="center" class="center">Main toolbar and menubar</td><td align="right" class="right"></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar-Help"></a>Help</h2></div></div><p>
-
-<div class="variablelist"><dl><dt><span class="term">Handbook</span></dt><dd><p>Select <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Handbook</span> to access
-this document from the KDE Help Center.
-</p></dd><dt><span class="term">Installation</span></dt><dd><p>Select <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Installation</span> to access
-the installation instructions for BibleTime from the KDE Help Center.
-</p></dd><dt><span class="term">Biblestudy HowTo</span></dt><dd><p>Select <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Biblestudy HowTo</span> to access
-A good basic text with recommendations for studying the Bible.
-</p></dd><dt><span class="term">What's This</span></dt><dd><p>
-Allows you to click on certain items for contextual help.
-</p></dd><dt><span class="term">Bug Report</span></dt><dd><p>
-Send a bug report to the program's maintainers to help development.
-Before sending a bug report please configure the bug report application
-to use your mail program.  This is done by <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">configure</span>
-on the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Submit A Bug Report</span> dialog.
-</p></dd><dt><span class="term">Daily Tip</span></dt><dd><p>Launches the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">tip of the day</span> dialog.</p></dd><dt><span class="term">About BibleTime</span></dt><dd><p>
-Opens a window with general BibleTime information.
-</p></dd><dt><span class="term">About KDE</span></dt><dd><p>
-Opens a window with general KDE information.
-</p></dd></dl></div>
-
-</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-bars-menubar-settings.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"></td></tr><tr><td width="33%" align="left">Settings </td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right"> </td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-bars-menubar-Window.html b/docs/handbook/html/hdbk-bars-menubar-Window.html
deleted file mode 100644
index 0fb41f0..0000000
--- a/docs/handbook/html/hdbk-bars-menubar-Window.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><head><title>Window</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Main toolbar and menubar"><link rel="previous" href="hdbk-bars-menubar-mainindex.html" title="Main Index"><link rel="next" href="hdbk-bars-menubar-settings.html" title="Settings"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Window</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-bars-menubar-mainindex.html">Prev</a></td><td align="center" class="center">Main toolbar and menubar</td><td align="right" class="right"><a accesskey="n" href="hdbk-bars-menubar-settings.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar-Window"></a>Window</h2></div></div><p>
-	<div class="variablelist"><dl><dt><span class="term">Save Profile</span></dt><dd><p>Saves the current configuration to
-	a selected profile</p></dd><dt><span class="term">Load Profile</span></dt><dd><p>Loads the contents of the named profile to
-	the current session of BibleTime.</p></dd><dt><span class="term">Configure Profile</span></dt><dd><p>This brings up the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">profiles</span> tab of the
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Options dialog</span>.
-	Here you create and manage profiles</p></dd><dt><span class="term">Fullscreen Mode</span></dt><dd><p>When <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Fullscreen Mode</span> is selected, BibleTime will expand
-	to the full size of your monitor screen.  To reverse the action select
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Fullscreen Mode</span>again. </p></dd><dt><span class="term">Cascade</span></dt><dd><p>Cascades open display windows</p></dd><dt><span class="term">Tile</span></dt><dd><p>Tiles open display windows</p></dd><dt><span class="term">Auto Cascade</span></dt><dd><p>
-	Automatically cascades newly opened display windows
-	</p></dd><dt><span class="term">Auto Tile</span></dt><dd><p>ditto for tiling newly opened display windows</p></dd><dt><span class="term">Close all</span></dt><dd><p>Closes all open display windows</p></dd><dt><span class="term">List of open modules</span></dt><dd><p>shows a list of all of the currently selected modules.</p></dd></dl></div>
-	</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-bars-menubar-mainindex.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-bars-menubar-settings.html">Next</a></td></tr><tr><td width="33%" align="left">Main Index </td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right"> Settings</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-bars-menubar-file.html b/docs/handbook/html/hdbk-bars-menubar-file.html
deleted file mode 100644
index 079fd2f..0000000
--- a/docs/handbook/html/hdbk-bars-menubar-file.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><head><title>File</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Main toolbar and menubar"><link rel="previous" href="hdbk-bars-menubar.html" title="Menubar"><link rel="next" href="hdbk-bars-menubar-view.html" title="View"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>File</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-bars-menubar.html">Prev</a></td><td align="center" class="center">Main toolbar and menubar</td><td align="right" class="right"><a accesskey="n" href="hdbk-bars-menubar-view.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar-file"></a>File</h2></div></div><p>
-
-	<div class="variablelist"><dl><dt><span class="term">Clear printing queue</span></dt><dd><p>Clears all items from the BibleTime print queue.
-	The BibleTime printing queue does not clear automatically.</p></dd><dt><span class="term">
-	Print</span></dt><dd><p>This menu item launches the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">printdialog</span> box.
-	From here you will select print or view as for any other KDE application.</p></dd></dl></div>
-	</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-bars-menubar.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-bars-menubar-view.html">Next</a></td></tr><tr><td width="33%" align="left">Menubar </td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right"> View</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-bars-menubar-mainindex.html b/docs/handbook/html/hdbk-bars-menubar-mainindex.html
deleted file mode 100644
index b028d28..0000000
--- a/docs/handbook/html/hdbk-bars-menubar-mainindex.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<html><head><title>Main Index</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Main toolbar and menubar"><link rel="previous" href="hdbk-bars-menubar-view.html" title="View"><link rel="next" href="hdbk-bars-menubar-Window.html" title="Window"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Main Index</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-bars-menubar-view.html">Prev</a></td><td align="center" class="center">Main toolbar and menubar</td><td align="right" class="right"><a accesskey="n" href="hdbk-bars-menubar-Window.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar-mainindex"></a>Main Index</h2></div></div><p>
-
-	<div class="variablelist"><dl><dt><span class="term">Search in module(s)</span></dt><dd><p>
-	If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Search in module(s)</span> is selected,
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">search dialog</span> is displayed.  Any selected documents
-	from the left pane are preselected on the choose modules tab.
-	</p></dd><dt><span class="term">Reset Main Index</span></dt><dd><p>
-	If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Reset Main Index</span> is selected,
-	the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Main Index</span> in the left pane will be rebuilt.
-	Any customization in the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">main index</span> and bookmarks
-	will be deleted.
-	</p></dd><dt><span class="term">Remove selected item</span></dt><dd><p>
-	If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Remove selected item</span> is selected,
-	any selected items in the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Main Index</span> in the left pane will be deleted.
-	This action can only be partly undone by the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Reset Main Index</span>.
-	Use this feature with caution.
-	</p></dd></dl></div>
-
-	</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-bars-menubar-view.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-bars-menubar-Window.html">Next</a></td></tr><tr><td width="33%" align="left">View </td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right"> Window</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-bars-menubar-settings.html b/docs/handbook/html/hdbk-bars-menubar-settings.html
deleted file mode 100644
index 68b7b5f..0000000
--- a/docs/handbook/html/hdbk-bars-menubar-settings.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><head><title>Settings</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Main toolbar and menubar"><link rel="previous" href="hdbk-bars-menubar-Window.html" title="Window"><link rel="next" href="hdbk-bars-menubar-Help.html" title="Help"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Settings</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-bars-menubar-Window.html">Prev</a></td><td align="center" class="center">Main toolbar and menubar</td><td align="right" class="right"><a accesskey="n" href="hdbk-bars-menubar-Help.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar-settings"></a>Settings</h2></div></div><p>
-
-	<div class="variablelist"><dl><dt><span class="term">Configure Toolbar</span></dt><dd><p>show the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Configure Toolbar</span> dialog.</p></dd><dt><span class="term">Configure BibleTime</span></dt><dd><p>Shows the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Options dialog</span>.
-	From this dialog the startup mode, fonts, colors, profiles,
-	sword features, and accelerators are configurable. </p></dd></dl></div>
-
-	</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-bars-menubar-Window.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-bars-menubar-Help.html">Next</a></td></tr><tr><td width="33%" align="left">Window </td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right"> Help</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-bars-menubar-view.html b/docs/handbook/html/hdbk-bars-menubar-view.html
deleted file mode 100644
index c6e74fa..0000000
--- a/docs/handbook/html/hdbk-bars-menubar-view.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><head><title>View</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Main toolbar and menubar"><link rel="previous" href="hdbk-bars-menubar-file.html" title="File"><link rel="next" href="hdbk-bars-menubar-mainindex.html" title="Main Index"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>View</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-bars-menubar-file.html">Prev</a></td><td align="center" class="center">Main toolbar and menubar</td><td align="right" class="right"><a accesskey="n" href="hdbk-bars-menubar-mainindex.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar-view"></a>View</h2></div></div><p>
-
-	<div class="variablelist"><dl><dt><span class="term">Show Toolbar</span></dt><dd><p>&gt;If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">show toolbar</span> is selected,
-	the toolbar is displayed.
-	If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">show toolbar</span> is unselected then the
-	toolbar is hidden.</p></dd><dt><span class="term">
-	Show Main Index</span></dt><dd><p>If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">show main index</span> is selected,
-	the left pane showing the available Sword documents is displayed.
-	If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">show main index</span> is unselected then the
-	left pane is hidden.</p></dd></dl></div>
-	</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-bars-menubar-file.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-bars-menubar-mainindex.html">Next</a></td></tr><tr><td width="33%" align="left">File </td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right"> Main Index</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-bars-menubar.html b/docs/handbook/html/hdbk-bars-menubar.html
deleted file mode 100644
index b5c01d4..0000000
--- a/docs/handbook/html/hdbk-bars-menubar.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<html><head><title>Menubar</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Main toolbar and menubar"><link rel="previous" href="hdbk-bars-toolbar-action.html" title="Button Action"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Menubar</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-bars-toolbar-action.html">Prev</a></td><td align="center" class="center">Main toolbar and menubar</td><td align="right" class="right"></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-menubar"></a>Menubar</h2></div></div><p>Various features of bibletime are accessed by way of 
-	drop down menus from the menubar.</p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-bars-menubar-file"></a>File</h3></div></div><p>
-
-	<div class="variablelist"><dl><dt><span class="term">Clear printing queue</span></dt><dd><p>Clears all items from the BibleTime print queue.
-	The BibleTime printing queue does not clear automatically.</p></dd><dt><span class="term">
-	Print</span></dt><dd><p>This menu item launches the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">printdialog</span> box.
-	From here you will select print or view as for any other KDE application.</p></dd><dt><span class="term">
-	Quit</span></dt><dd><p>Closes BibleTime.</p></dd></dl></div>
-	</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-bars-menubar-view"></a>View</h3></div></div><p>
-
-	<div class="variablelist"><dl><dt><span class="term">Show Toolbar</span></dt><dd><p>If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">show toolbar</span> is selected,
-	the toolbar is displayed.
-	If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">show toolbar</span> is unselected then the
-	toolbar is hidden.</p></dd><dt><span class="term">
-	Show Main Index</span></dt><dd><p>If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">show main index</span> is selected,
-	the left pane showing the available Sword documents is displayed.
-	If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">show main index</span> is unselected then the
-	left pane is hidden.</p></dd></dl></div>
-	</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-bars-menubar-mainindex"></a>Search</h3></div></div><p>
-
-	<div class="variablelist"><dl><dt><span class="term">Search in default Bible</span></dt><dd><p>
-	If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Search in default Bible</span> is selected,
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">search dialog</span> is displayed with the default 
-	Bible selected as the search parameter.
-	</p></dd><dt><span class="term">Search in open module(s)</span></dt><dd><p>
-	If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Search in open module(s)</span> is selected,
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">search dialog</span> is displayed with all of the 
-	open modules selected as the search parameters.
-	</p></dd></dl></div>
-
-	</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-bars-menubar-Window"></a>Window</h3></div></div><p>
-	<div class="variablelist"><dl><dt><span class="term">Save session</span></dt><dd><p>Saves the current configuration to
-	a selected Session.</p></dd><dt><span class="term">Save as new session</span></dt><dd><p>Saves the current configuration to
-	a session, and allows the new session to be named.</p></dd><dt><span class="term">Load session</span></dt><dd><p>Loads the contents of the named session to
-	the current session of BibleTime.</p></dd><dt><span class="term">Configure sessions</span></dt><dd><p>This brings up the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Sessions</span> tab of the
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Preferences Dialog</span>.
-	Here you create and manage Sessions.</p></dd><dt><span class="term">Fullscreen Mode</span></dt><dd><p>When <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Fullscreen Mode</span> is selected, BibleTime will expand
-	to the full size of your monitor screen.  To reverse the action select
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Fullscreen Mode</span>again. </p></dd><dt><span class="term">Cascade</span></dt><dd><p>Cascades open display windows.</p></dd><dt><span class="term">Tile</span></dt><dd><p>Tiles open display windows.</p></dd><dt><span class="term">Auto Cascade</span></dt><dd><p>Automatically cascades newly opened display windows.</p></dd><dt><span class="term">Auto Tile</span></dt><dd><p>Ditto for tiling newly opened display windows.</p></dd><dt><span class="term">Close all</span></dt><dd><p>Closes all open display windows.</p></dd><dt><span class="term">List of open modules</span></dt><dd><p>Shows a list of all of the currently open modules.  
-	Selecting a module in this list makes that open module the 
-	selected module in the display area.</p></dd></dl></div>
-	</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-bars-menubar-settings"></a>Settings</h3></div></div><p>
-
-	<div class="variablelist"><dl><dt><span class="term">Configure Toolbar</span></dt><dd><p>Show the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Configure Toolbar</span> dialog.</p></dd><dt><span class="term">Configure BibleTime</span></dt><dd><p>Shows the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Preferences Dialog</span>.
-	From this dialog the startup mode, fonts, colors, sessions,
-	sword features, and accelerators are configurable. </p></dd></dl></div>
-
-	</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-bars-menubar-Help"></a>Help</h3></div></div><p>
-
-<div class="variablelist"><dl><dt><span class="term">Handbook</span></dt><dd><p>Select <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Handbook</span> to access
-this document from the KDE Help Center.
-</p></dd><dt><span class="term">Biblestudy HowTo</span></dt><dd><p>Select <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Biblestudy HowTo</span> to access
-a good basic text with recommendations for studying the Bible.
-</p></dd><dt><span class="term">What's This</span></dt><dd><p>
-Allows you to click on certain items for contextual help.
-</p></dd><dt><span class="term">Bug Report</span></dt><dd><p>
-Send a bug report to the program's maintainers to help development.
-Before sending a bug report please configure the bug report application
-to use your mail program.  This is done by <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">configure</span>
-on the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Submit A Bug Report</span> dialog.
-</p></dd><dt><span class="term">Daily Tip</span></dt><dd><p>Launches the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">tip of the day</span> dialog.</p></dd><dt><span class="term">About BibleTime</span></dt><dd><p>
-Opens a window with general BibleTime information.
-</p></dd><dt><span class="term">About KDE</span></dt><dd><p>
-Opens a window with general KDE information.
-</p></dd></dl></div>
-
-</p></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-bars-toolbar-action.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"></td></tr><tr><td width="33%" align="left">Button Action </td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right"> </td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-bars-toolbar-Configtoolbar.png b/docs/handbook/html/hdbk-bars-toolbar-Configtoolbar.png
deleted file mode 100644
index 6b9f33b..0000000
--- a/docs/handbook/html/hdbk-bars-toolbar-Configtoolbar.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-bars-toolbar-action.html b/docs/handbook/html/hdbk-bars-toolbar-action.html
deleted file mode 100644
index c4f64a6..0000000
--- a/docs/handbook/html/hdbk-bars-toolbar-action.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<html><head><title>Button Action</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-bars.html" title="Chapter 5. Main toolbar and menubar"><link rel="previous" href="hdbk-bars.html" title="Chapter 5. Main toolbar and menubar"><link rel="next" href="hdbk-bars-menubar.html" title="Menubar"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Button Action</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-bars.html">Prev</a></td><td align="center" class="center">Main toolbar and menubar</td><td align="right" class="right"><a accesskey="n" href="hdbk-bars-menubar.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-toolbar-action"></a>Button Action</h2></div></div><p>
-
-	<div class="mediaobject"><hr><img src="./view_sidetree.png" alt="view_sidetree.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Preferences Dialog</span>, this icon opens the
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Manage sessions</span> dialog.  Here you can save a display for later recall.
-	</p></div><hr></div>
-
-	<div class="mediaobject"><hr><img src="./key_bindings.png" alt="key_bindings.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Preferences Dialog</span>, this icon opens the
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Accelerator</span> dialog.  Here you can customize the key bindings 
-	(keyboard shortcuts).
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./kcmfontinst.png" alt="kcmfontinst.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Preferences Dialog</span>, this icon opens the
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Choose Fonts</span> dialog.  Here you select the font used to display your sword modules.
-	</p></div><hr></div>
-
-
-	<div class="mediaobject"><hr><img src="./window_fullscreen.png" alt="window_fullscreen.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon expands BibleTime
-	to use the entire viewing area of your monitor.
-	</p></div><hr></div>
-
-	<div class="mediaobject"><hr><img src="./ktip.png" alt="ktip.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon opens the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Daily Tip</span>.
-	</p></div><hr></div>
-
-	
-	<div class="mediaobject"><hr><img src="./configure.png" alt="configure.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon opens the
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Configure BibleTime</span> dialog.
-
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./contents.png" alt="contents.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon opens the
-	Handbook.
-
-	</p></div><hr></div>
-
-	<div class="mediaobject"><hr><img src="./exit.png" alt="exit.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon closes BibleTime.
-	</p></div><hr></div>
-		
-	<div class="mediaobject"><hr><img src="./fileclose.png" alt="fileclose.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon closes all open
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Document Windows</span>.
-	</p></div><hr></div>
-		
-	<div class="mediaobject"><hr><img src="./fileprint.png" alt="fileprint.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon opens the
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Print</span> dialog.  Right clicking in an <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Active Document Window</span>
-	and this symbol in a drop down menu sends the selected text to the print queue.
-	</p></div><hr></div>
-		
-	<div class="mediaobject"><hr><img src="./find.png" alt="find.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Main Index</span> or the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span>
-	this icon opens the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Search Dialog</span>.
-	</p></div><hr></div>
-	
-
-
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_bible_add.png" alt="bible_add.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Document Control Menu</span> this icon opens the drop down menu that
-	allows selection of an additional Bible Text.
-	</p></div><hr></div>
-
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_bible.png" alt="bible.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">main index</span> this icon opens a Sword book module.  
-	This is used for modules that are not commentaries, lexicons or Bible texts.
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_book_add.png" alt="book_add.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Document Control Menu</span> this icon opens the drop down menu that
-	allows selection of an additional Sword book module. This is used for modules that are not 
-	commentaries, lexicons or Bible texts.
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_book.png" alt="book.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">main index</span> this icon opens a Bible Text.
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_cascade_auto.png" alt="cascade_auto.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon automatically cascades
-	displayed books as they are opened.
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_cascade.png" alt="cascade.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon cascades the displayed books now.
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_commentary_add.png" alt="commentary_add.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Document Control Menu</span> this icon opens the drop down menu that
-	allows selection of an additional Lexicon.
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_commentary.png" alt="commentary.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">main index</span> this icon opens a lexicon.
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_displayconfig.png" alt="displayconfig.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Preferences Dialog</span>, this icon opens the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Colors Dialog</span>.
-	Here you can change the colors of the displayed text..
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_lexicon_add.png" alt="lexicon_add.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Document Control Menu</span> this icon opens the drop down menu that
-	allows selection of an additional Lexicon.
-	</p></div><hr></div>
-
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_lexicon.png" alt="lexicon.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">main index</span> this icon opens a lexicon.
-	</p></div><hr></div>
-
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_startconfig.png" alt="startconfig.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Preferences Dialog</span>, this icon opens the Startup Dialog.
-	Here you can turn on (off) the tip of the day and the startup logo.
-	</p></div><hr></div>
-
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_swordconfig.png" alt="swordconfig.png"><div class="caption"><p><span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Configure Sword</span>. This icon is used in the
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Preferences Dialog</span>. Here you can configure features controlled by
-	the sword backend. Like default books, language used for book names, and various 
-	text display features.
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_sync.png" alt="sync.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon links a commentary to 
-	the current open Bible. Thereafter the Commentary and the Bible scroll together.
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_tile_auto.png" alt="tile_auto.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon automatically tiles
-	displayed books as they are opened.
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./hi32-action-bt_tile.png" alt="tile.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon tiles the displayed books now.
-	</p></div><hr></div>
-	
-	<div class="mediaobject"><hr><img src="./hi32-app-bibletime.png" alt="bibletime.png"><div class="caption"><p>This icon is used with the desktop shortcut that launches BibleTime.
-	In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon displays the BibleTime version
-	information, license, and other interesting information.
-	</p></div><hr></div>
-
-
-
-	<div class="mediaobject"><hr><img src="./go.png" alt="go.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon displays the KDE version
-	information, license, and other interesting information.
-	</p></div><hr></div>
-
-
-
-	
-
-	<div class="mediaobject"><hr><img src="./queue.png" alt="queue.png"><div class="caption"><p>In the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Tool Bar</span> this icon will clear the print queue.
-	</p></div><hr></div>
-
-	</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-bars.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-bars-menubar.html">Next</a></td></tr><tr><td width="33%" align="left">Main toolbar and menubar </td><td width="34%" align="center"><a href="hdbk-bars.html">Up</a></td><td width="33%" align="right"> Menubar</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-bars.html b/docs/handbook/html/hdbk-bars.html
deleted file mode 100644
index b96da15..0000000
--- a/docs/handbook/html/hdbk-bars.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><head><title>Chapter 5. Main toolbar and menubar</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="index.html" title="The BibleTime Handbook"><link rel="previous" href="hdbk-config-bt-Accelerators.html" title="Accelerators"><link rel="next" href="hdbk-bars-toolbar-action.html" title="Button Action"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Main toolbar and menubar</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-config-bt-Accelerators.html">Prev</a></td><td align="center" class="center"> </td><td align="right" class="right"><a accesskey="n" href="hdbk-bars-toolbar-action.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="hdbk-bars"></a>Chapter 5. Main toolbar and menubar</h2></div></div><p></p><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-bars-toolbar"></a>Toolbar</h2></div></div><p> The action of each button is described in the configuration dialog box.
-	Moving the cursor over a button will activate the button's tooltip which
-	describes that buttons action.
-	</p></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-config-bt-Accelerators.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-bars-toolbar-action.html">Next</a></td></tr><tr><td width="33%" align="left">Accelerators </td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right"> Button Action</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-conf-optdialog-color.png b/docs/handbook/html/hdbk-conf-optdialog-color.png
deleted file mode 100644
index 52691c3..0000000
--- a/docs/handbook/html/hdbk-conf-optdialog-color.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-conf-optdialog-fonts.png b/docs/handbook/html/hdbk-conf-optdialog-fonts.png
deleted file mode 100644
index 55ea3c8..0000000
--- a/docs/handbook/html/hdbk-conf-optdialog-fonts.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-conf-optdialog-start.png b/docs/handbook/html/hdbk-conf-optdialog-start.png
deleted file mode 100644
index 3e4a5b1..0000000
--- a/docs/handbook/html/hdbk-conf-optdialog-start.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-conf-optdialog-sword.png b/docs/handbook/html/hdbk-conf-optdialog-sword.png
deleted file mode 100644
index 3501bfe..0000000
--- a/docs/handbook/html/hdbk-conf-optdialog-sword.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-config-bt-Accelerators.html b/docs/handbook/html/hdbk-config-bt-Accelerators.html
deleted file mode 100644
index b28de9d..0000000
--- a/docs/handbook/html/hdbk-config-bt-Accelerators.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><head><title>Accelerators</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-config.html" title="Chapter 4. Configuring BibleTime"><link rel="previous" href="hdbk-config-bt.html" title="Preferences - BibleTime Dialog"><link rel="next" href="hdbk-bars.html" title="Chapter 5. Main toolbar and menubar"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Accelerators</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-config-bt.html">Prev</a></td><td align="center" class="center">Configuring BibleTime</td><td align="right" class="right"><a accesskey="n" href="hdbk-bars.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-config-bt-Accelerators"></a>Accelerators</h2></div></div><p>Accelerators are special key commands that can be used in the place of
-	the menu items and icons. A number of BibleTime's commands have
-	predefined Accelerators. All of BibleTime's commands can be assigned
-	accelerators here.</p><div class="table"><p><b>Table 4.2. Default accelerators</b></p><table summary="Default accelerators" border="1"><colgroup><col><col></colgroup><thead><tr><th>Action</th><th>Key combination</th></tr></thead><tbody><tr><td>Auto Tile</td><td>Ctrl+Alt+T</td></tr><tr><td>Auto Cascade </td><td>Ctrl+Alt+A </td></tr><tr><td>Cascade </td><td>Ctrl+A </td></tr><tr><td>Close All </td><td>Shift+Ctrl+A</td></tr><tr><td>Configure Toolbars</td><td> </td></tr><tr><td>Preferences </td><td> </td></tr><tr><td>Quit </td><td>Ctrl+Q</td></tr><tr><td>Remove Selected Item(s)</td><td>Ctrl+Alt+D</td></tr><tr><td>Reset Main Index </td><td>Ctrl+Alt+R</td></tr><tr><td>Search in Selected Module(s) </td><td>Ctrl+Alt+S</td></tr><tr><td>Tile </td><td>Ctrl+T </td></tr></tbody></table></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-config-bt.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-bars.html">Next</a></td></tr><tr><td width="33%" align="left">Preferences - BibleTime Dialog </td><td width="34%" align="center"><a href="hdbk-config.html">Up</a></td><td width="33%" align="right"> Main toolbar and menubar</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-config-bt-Colors.html b/docs/handbook/html/hdbk-config-bt-Colors.html
deleted file mode 100644
index 9d177b2..0000000
--- a/docs/handbook/html/hdbk-config-bt-Colors.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><head><title>Colors</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-config.html" title="Chapter 4. Configuring Bibletime"><link rel="previous" href="hdbk-config-bt.html" title="Preferences - Bibletime Dialog"><link rel="next" href="hdbk-config-bt-profiles.html" title="Sessions"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Colors</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-config-bt.html">Prev</a></td><td align="center" class="center">Configuring Bibletime</td><td align="right" class="right"><a accesskey="n" href="hdbk-config-bt-profiles.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-config-bt-Colors"></a>Colors</h2></div></div><p>The colors of the objects in display windows can be customized.
-	Objects that can be customized are:</p><table class="simplelist" border="0" summary="Simple list"><tr><td>Text</td></tr><tr><td>Highlighted verse</td></tr><tr><td>Footnotes</td></tr><tr><td>Morphological Tags</td></tr><tr><td>Background</td></tr><tr><td>Hyperlinks</td></tr><tr><td>Strong's Numbers</td></tr><tr><td>Words of Jesus</td></tr></table><p>Some options like &quot;Words of Jesus&quot; only apply to texts which
-	support this special feature.</p><div class="mediaobject"><hr><img src="hdbk-conf-optdialog-color.png" alt="Options Dialog - Color"><div class="caption"><p>The Options dialog - Color.</p></div><hr></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-config-bt.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-config-bt-profiles.html">Next</a></td></tr><tr><td width="33%" align="left">Preferences - Bibletime Dialog </td><td width="34%" align="center"><a href="hdbk-config.html">Up</a></td><td width="33%" align="right"> Sessions</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-config-bt-profiles.html b/docs/handbook/html/hdbk-config-bt-profiles.html
deleted file mode 100644
index 3024494..0000000
--- a/docs/handbook/html/hdbk-config-bt-profiles.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><head><title>Sessions</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-config.html" title="Chapter 4. Configuring Bibletime"><link rel="previous" href="hdbk-config-bt-Colors.html" title="Colors"><link rel="next" href="hdbk-config-bt-sword.html" title="Sword"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Sessions</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-config-bt-Colors.html">Prev</a></td><td align="center" class="center">Configuring Bibletime</td><td align="right" class="right"><a accesskey="n" href="hdbk-config-bt-sword.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-config-bt-profiles"></a>Sessions</h2></div></div><p>Sessions define the appearance of the work area, for example which
-	windows are open and which texts should be displayed in these windows.
-	Once a session is created, use the menu item <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">window</span> -&gt;
-	<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">save session</span> to save a current session into a
-	session file. Use <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">window</span> -&gt; <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">load session</span> to
-	load a previously saved session into BibleTime.</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-config-bt-Colors.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-config-bt-sword.html">Next</a></td></tr><tr><td width="33%" align="left">Colors </td><td width="34%" align="center"><a href="hdbk-config.html">Up</a></td><td width="33%" align="right"> Sword</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-config-bt-sword.html b/docs/handbook/html/hdbk-config-bt-sword.html
deleted file mode 100644
index 96ddc1b..0000000
--- a/docs/handbook/html/hdbk-config-bt-sword.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html><head><title>Sword</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-config.html" title="Chapter 4. Configuring Bibletime"><link rel="previous" href="hdbk-config-bt-profiles.html" title="Sessions"><link rel="next" href="hdbk-config-bt-Accelerators.html" title="Accelerators"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Sword</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-config-bt-profiles.html">Prev</a></td><td align="center" class="center">Configuring Bibletime</td><td align="right" class="right"><a accesskey="n" href="hdbk-config-bt-Accelerators.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-config-bt-sword"></a>Sword</h2></div></div><p>Many features provided by the Sword backend can now be customized in
-	BibleTime.</p><div class="mediaobject"><hr><img src="hdbk-conf-optdialog-sword.png" alt="Options Dialog - Sword"><div class="caption"><p>The Options dialog - Sword.</p></div><hr></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-sword-gen"></a>Sword General</h3></div></div><p>Key Cache for Lexicons</p><p>Bibletime can create a key cache for lexicons.  This speeds up
-		opening large lexicon modules.  The cache file does use some disc space,
-		so if your computer has only a small amount of free space, you might want
-		to disable this feature.</p><p>Scrolling Behavior</p><p>The default is that a down arrow moves the current position in a text to
-		the next verse.  This option allows the down arrow to move the current
-		position in a text to the previous verse.</p><p>Specify a language for biblical book names</p><p>This feature allows the language used to displayed book names
-		to be changed.  For example the King James Version can be displayed
-		with German book names.  If your language is not displayed and you would
-		like to create a sword locale for your language, please see the
-		CrossWire Bible Society developers site for details.</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-sword-mod"></a>Sword Default Modules</h3></div></div><p>Default modules are specified here.</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-sword-filter"></a>Sword filter settings</h3></div></div><p>Filters control the appearance of text in the display windows.
-		Here you can chose the default settings for the various filters.</p><p>The items controlled by filters are:</p><div class="itemizedlist"><ul type="disc"><li><p>Show line brake after each verse</p></li><li><p>Show verse numbers</p></li><li><p>Show footnotes</p></li><li><p>Show Strong's numbers</p></li><li><p>Show headings</p></li><li><p>Show morphologic tags</p></li><li><p>Show lemmas</p></li><li><p>Show Hebrew vowel points</p></li><li><p>Show Hebrew cantillation marks</p></li><li><p>Show Greek accents</p></li></ul></div></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-config-bt-profiles.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-config-bt-Accelerators.html">Next</a></td></tr><tr><td width="33%" align="left">Sessions </td><td width="34%" align="center"><a href="hdbk-config.html">Up</a></td><td width="33%" align="right"> Accelerators</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-config-bt.html b/docs/handbook/html/hdbk-config-bt.html
deleted file mode 100644
index b1787ab..0000000
--- a/docs/handbook/html/hdbk-config-bt.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html><head><title>Preferences - BibleTime Dialog</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-config.html" title="Chapter 4. Configuring BibleTime"><link rel="previous" href="hdbk-config.html" title="Chapter 4. Configuring BibleTime"><link rel="next" href="hdbk-config-bt-Accelerators.html" title="Accelerators"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Preferences - BibleTime Dialog</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-config.html">Prev</a></td><td align="center" class="center">Configuring BibleTime</td><td align="right" class="right"><a accesskey="n" href="hdbk-config-bt-Accelerators.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-config-bt"></a>Preferences - BibleTime Dialog</h2></div></div><p>The preferences dialog allows many BibleTime and Sword
-	features to be customized.</p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-startup"></a>Startup</h3></div></div><p>The startup behavior can be customized.
-		Select from the following options:</p><table class="simplelist" border="0" summary="Simple list"><tr><td>Show tip of the day</td></tr><tr><td>Show startup Logo</td></tr><tr><td>Restore windows from the last BibleTime session</td></tr></table><div class="mediaobject"><hr><img src="hdbk-conf-optdialog-start.png" alt="Preferences Dialog"><div class="caption"><p>The Preferences dialog - Startup.</p></div><hr></div></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-fonts"></a>Fonts</h3></div></div><p>BibleTime uses the KDE general display font.
-		The KDE general display font can be changed from the KDE Control Center.
-		If the module you are using does not display correctly with the general display font,
-		use the fonts options dialog to select a different one. BibleTime now 
-		applies font selections to specific languages.
-		</p><div class="mediaobject"><hr><img src="hdbk-conf-optdialog-fonts.png" alt="Options Dialog - fonts"><div class="caption"><p>The Options dialog - Fonts.</p></div><hr></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="hdbk-config-bt-fonts-what"></a>What kind of fonts can I use?</h4></div></div><p>BibleTime can now use any system fonts.  These may be Bitmap Fonts, 
-			Adobe® Type1 Fonts, 
-			Adobe® Type3 fonts, or 
-			TrueType®.  These fonts may be supplied
-			with your distribution, or may be obtained separately.</p><p>As long as the modules you are interested in display correctly nothing
-			needs to be done here.  If a module you are interested in displays as a series 
-			of question marks (???????????????????) or empty boxes the font available to 
-			BibleTime does not contain the characters used in your document.</p><p>In the fonts options dialog, choose the desired language from the drop down menu.
-			Select the use custom font checkbox.  Now select a font.  Clearlyu supports most 
-			languages so it is a good first try.  If no installed font can be found that 
-			displays the module you are interested in, try installing the KDE localization
-			package for that language.</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="hdbk-config-bt-addfont"></a>Installing fonts</h4></div></div><p>Detailed font installation instructions are outside the scope of this handbook.
-			If you need detailed font installation information, please read the
-			<a href="http://pegasus.rutgers.edu/~elflord/font_howto" target="_top">Font-HOWTO</a>, and
-			<a href="http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Unicode-HOWTO.html#toc4" target="_top">
-			The Unicode HOWTO</a></p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>If your distribution includes a font installer use it, it makes
-			font installation much easier!</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>If you use a small font like clearlyu (about 22kb) BibleTime
-			will run faster than if a large font like 
-			Bitstream Cyberbit® (about 12Mb)
-			is used.</p></div></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="hdbk-config-bt-ob-font"></a>Obtaining Fonts</h4></div></div><p>Fonts can be obtained from a number of sources.</p><div class="itemizedlist"><ul type="disc"><li><p>Your distribution.</p></li><li><p>Your distribution's localization packages.</p></li><li><p>An existing Microsoft® Windows® installation on the same computer.</p></li><li><p>A font collection, such as are available from 
-			Adobe® or
-			Bitstream®.</p></li><li><p>On line font collections.</p></li></ul></div><p>Unicode fonts support more characters than other fonts, so are
-			generally a good choice for BibleTime, some of these fonts are
-			available at no charge.  Few of the fonts available include all of range of symbols
-			defined in the Unicode standard, so you may try several before finding what you need</p><p>Here is a listing of some of the fonts available:</p><div class="table"><p><b>Table 4.1. Unicode Fonts</b></p><table summary="Unicode Fonts" border="1"><colgroup><col><col></colgroup><tbody><tr><td>Clearlyu</td><td>Included in some distributions. Contains European, Greek, Hebrew, Thai.
-				Does not contain Chinease pictographs, or Arabic</td></tr><tr><td><a href="ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS" target="_top">ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS</a>.</td><td>Several fonts available from the Crosswire Bible Society ftp site.</td></tr><tr><td><a href="ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/" target="_top">Bitstream CyberBit</a></td><td>Covers almost the entire range of Unicode.</td></tr><tr><td><a href="http://bibliofile.mc.duke.edu/gww/fonts/Unicode.html" target="_top">Caslon, Monospace, Cupola, Caliban</a></td><td>Partial coverage, see information on linked site.</td></tr></tbody></table></div><p>The most complete listing of Unicode fonts that we are aware of is
-			<a href="http://www.ccss.de/slovo/unifonts.htm" target="_top">
-			Christoph Singer's  &quot;Multilingual Unicode TrueType Fonts in the Internet&quot;</a> with 24 fonts listed.</p><p>Another Unicode font list can be found at:
-			<a href="http://www.hclrss.demon.co.uk/unicode/fontsbyrange.html" target="_top">
-			Unicode Font List</a>.
-			</p></div></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-Colors"></a>Colors</h3></div></div><p>The colors of the objects in display windows can be customized.
-		Objects that can be customized are:</p><table class="simplelist" border="0" summary="Simple list"><tr><td>Text</td></tr><tr><td>Highlighted verse</td></tr><tr><td>Footnotes</td></tr><tr><td>Morphological Tags</td></tr><tr><td>Background</td></tr><tr><td>Hyperlinks</td></tr><tr><td>Strong's Numbers</td></tr><tr><td>Words of Jesus</td></tr></table><p>Some options like &quot;Words of Jesus&quot; only apply to texts which
-		support this special feature.</p><div class="mediaobject"><hr><img src="hdbk-conf-optdialog-color.png" alt="Options Dialog - Color"><div class="caption"><p>The Options dialog - Color.</p></div><hr></div></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-profiles"></a>Sessions</h3></div></div><p>Sessions define the appearance of the work area, for example which
-		windows are open and which texts should be displayed in these windows.
-		Once a session is created, use the menu item <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Window</span> -&gt;
-		<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Save session</span> to save a current session into a
-		session file. Use <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Window</span> -&gt; <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Load session</span> to
-		load a previously saved session into BibleTime.</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-config-bt-sword"></a>Sword</h3></div></div><p>Many features provided by the Sword backend can now be customized in
-		BibleTime.</p><div class="mediaobject"><hr><img src="hdbk-conf-optdialog-sword.png" alt="Options Dialog - Sword"><div class="caption"><p>The Options dialog - Sword.</p></div><hr></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="hdbk-config-bt-sword-gen"></a>Sword General</h4></div></div><p>Key Cache for Lexicons</p><p>BibleTime can create a key cache for lexicons.  This speeds up
-		opening large lexicon modules.  The cache file does use some disc space,
-		so if your computer has only a small amount of free space, you might want
-		to disable this feature.</p><p>Scrolling Behavior</p><p>The default is that a down arrow moves the current position in a text to
-		the next verse.  This option allows the down arrow to move the current
-		position in a text to the previous verse.</p><p>Specify a language for biblical book names</p><p>This feature allows the language used to displayed book names
-		to be changed.  For example the King James Version can be displayed
-		with German book names.  If your language is not displayed and you would
-		like to create a sword locale for your language, please see the
-		CrossWire Bible Society developers site for details.</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="hdbk-config-bt-sword-mod"></a>Sword Default Modules</h4></div></div><p>Default modules are specified here.</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="hdbk-config-bt-sword-filter"></a>Sword Filter Settings</h4></div></div><p>Filters control the appearance of text in the display windows.
-		Here you can chose the default settings for the various filters.</p><p>The items controlled by filters are:</p><div class="itemizedlist"><ul type="disc"><li><p>Show line break after each verse</p></li><li><p>Show verse numbers</p></li><li><p>Show footnotes</p></li><li><p>Show Strong's numbers</p></li><li><p>Show headings</p></li><li><p>Show morphologic tags</p></li><li><p>Show lemmas</p></li><li><p>Show Hebrew vowel points</p></li><li><p>Show Hebrew cantillation marks</p></li><li><p>Show Greek accents</p></li></ul></div></div></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-config.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-config-bt-Accelerators.html">Next</a></td></tr><tr><td width="33%" align="left">Configuring BibleTime </td><td width="34%" align="center"><a href="hdbk-config.html">Up</a></td><td width="33%" align="right"> Accelerators</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-config-toolbar.png b/docs/handbook/html/hdbk-config-toolbar.png
deleted file mode 100644
index ab1f513..0000000
--- a/docs/handbook/html/hdbk-config-toolbar.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-config.html b/docs/handbook/html/hdbk-config.html
deleted file mode 100644
index b833278..0000000
--- a/docs/handbook/html/hdbk-config.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><head><title>Chapter 4. Configuring BibleTime</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="index.html" title="The BibleTime Handbook"><link rel="previous" href="hdbk-op-output.html" title="Exporting and Printing"><link rel="next" href="hdbk-config-bt.html" title="Preferences - BibleTime Dialog"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Configuring BibleTime</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-op-output.html">Prev</a></td><td align="center" class="center"> </td><td align="right" class="right"><a accesskey="n" href="hdbk-config-bt.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="hdbk-config"></a>Chapter 4. Configuring BibleTime</h2></div></div><p>The BibleTime user interface can be customized in many ways
-depending on your needs.  To access the configuration dialogs, in the
-main toolbar select <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">settings</span>. From here select
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">configure toolbars</span> to launch the dialog
-configure toolbars dialog, or select <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Configure BibleTime</span>
-to launch the options dialog.</p><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-config-toolbar"></a>Configure Toolbars Dialog</h2></div></div><p>The Configure Toolbars dialog allows adding and removing actions from
-	the main toolbar of BibleTime. The order of actions in the main toolbar
-	can also be changed.</p><div class="mediaobject"><hr><img src="hdbk-config-toolbar.png" alt="Toolbar Configuration Dialog"><div class="caption"><p>The Toolbar Configuration dialog.</p></div><hr></div></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-op-output.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-config-bt.html">Next</a></td></tr><tr><td width="33%" align="left">Exporting and Printing </td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right"> Preferences - BibleTime Dialog</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-inst-sources-installmgr.png b/docs/handbook/html/hdbk-inst-sources-installmgr.png
deleted file mode 100644
index 11c577a..0000000
--- a/docs/handbook/html/hdbk-inst-sources-installmgr.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-intro-ToDo.html b/docs/handbook/html/hdbk-intro-ToDo.html
deleted file mode 100644
index 58f8210..0000000
--- a/docs/handbook/html/hdbk-intro-ToDo.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><head><title>ToDo</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-intro.html" title="Chapter 1. Introduction"><link rel="previous" href="hdbk-intro.html" title="Chapter 1. Introduction"><link rel="next" href="hdbk-intro-motivation.html" title="Motivation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>ToDo</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-intro.html">Prev</a></td><td align="center" class="center">Introduction</td><td align="right" class="right"><a accesskey="n" href="hdbk-intro-motivation.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-intro-ToDo"></a>ToDo</h2></div></div><p>
-We have lots to do. Because we are a very small team of active developers it's
-very hard to get reasonable results in a short time. If you are interested in
-helping the BibleTime team, please contact us at
-<a href="http://sourceforge.net/pm/?group_id=954" target="_top">Sourceforge BibleTime home page</a>.
-Information can also be found at <a href="http://www.bibletime.info/" target="_top">the BibleTime
-homepage</a>.</p><p>The BibleTime project needs programmers / developers, translators, reviewers, testers, and
-prayer warriors.  If you can help with any of these tasks or think up another, please join us.
-Without your help, BibleTime will develop very very slow and it will take
-a very long time until you get a full-featured Bible study tool.
-</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-intro.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-intro-motivation.html">Next</a></td></tr><tr><td width="33%" align="left">Introduction </td><td width="34%" align="center"><a href="hdbk-intro.html">Up</a></td><td width="33%" align="right"> Motivation</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-intro-motivation.html b/docs/handbook/html/hdbk-intro-motivation.html
deleted file mode 100644
index f0ec645..0000000
--- a/docs/handbook/html/hdbk-intro-motivation.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html><head><title>Motivation</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-intro.html" title="Chapter 1. Introduction"><link rel="previous" href="hdbk-intro-ToDo.html" title="ToDo"><link rel="next" href="hdbk-term.html" title="Chapter 2. Starting BibleTime"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Motivation</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-intro-ToDo.html">Prev</a></td><td align="center" class="center">Introduction</td><td align="right" class="right"><a accesskey="n" href="hdbk-term.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-intro-motivation"></a>Motivation</h2></div></div><p>
-Our desire is to serve God, and to do our part to help others grow in their
-relationship with Him. We have found a gaping hole, in that there has been a
-total lack of user-friendly Bible-study software available for Linux®-based
-computers. We have developed BibleTime to fill that void.
-We have striven to make this a powerful, quality program, and still make it
-simple and intuitive to operate. It is our desire that God be praised, as He is
-the source of all good things.
-</p><table border="0" width="100%" cellspacing="0" cellpadding="0" class="blockquote" summary="Block quote"><tr><td width="10%" valign="top"> </td><td width="80%" valign="top"><p>Every good thing given and every perfect gift is from above,
-coming down from the Father of lights, with whom there is no
-variation or shifting shadow.</p></td><td width="10%" valign="top"> </td></tr><tr><td colspan="2" align="right" valign="top">--<span class="attribution">James 1:17, NASB</span></td><td width="10%" valign="top"> </td></tr></table><p>
-God bless you as you use this program, and may He be glorified by the work of
-our hands!
-</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-intro-ToDo.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-term.html">Next</a></td></tr><tr><td width="33%" align="left">ToDo </td><td width="34%" align="center"><a href="hdbk-intro.html">Up</a></td><td width="33%" align="right"> Starting BibleTime</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-intro.html b/docs/handbook/html/hdbk-intro.html
deleted file mode 100644
index ba6313f..0000000
--- a/docs/handbook/html/hdbk-intro.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html><head><title>Chapter 1. Introduction</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="index.html" title="The BibleTime Handbook"><link rel="previous" href="index.html" title="The BibleTime Handbook"><link rel="next" href="hdbk-intro-ToDo.html" title="ToDo"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Introduction</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="index.html">Prev</a></td><td align="center" class="center"> </td><td align="right" class="right"><a accesskey="n" href="hdbk-intro-ToDo.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="hdbk-intro"></a>Chapter 1. Introduction</h2></div></div><p>
-BibleTime is a powerful Bible study tool written for the KDE environment on the
-Linux operating system. It is based on the <a href="http://www.crosswire.org/sword" target="_top">Sword</a> library, which provides the back-end
-functionality for BibleTime, such as viewing Bible text, searching, bookmarking,
-etc. Sword is the flagship product of the <a href="http://www.crosswire.org" target="_top">Crosswire Bible Society</a>. </p><p>BibleTime is designed to be used with documents that have been encoded in
-Theological Markup Language (ThML) and General Bible Format (GBF).  These markup
-languages are focused on the requirements of religious texts.
-Complete information on the supported document formats can be found in the <a href="http://www.crosswire.org/sword/develop/index.jsp" target="_top">
-developers section of the Sword Project, Crosswire Bible Society</a>.</p><p>
-Over 200 documents in 50 languages are available from the <a href="http://www.crosswire.org" target="_top">Crosswire Bible Society</a>.   These include:
-</p><p>
-<div class="variablelist"><dl><dt><span class="term">Bibles</span></dt><dd><p>
-The full Bible text, with optional things like Strong's Numbers and footnotes in the text.  The Strong
-Numbers hot link to the entry in Strong's Hebrew Bible Dictionary or Strong's Greek Bible Dictionary.
-Bibles are available in many languages, and include not only modern versions, but also 
-Ancient texts like the Aleppo Codex (Hebrew), and the Septuagint (Greek).
-</p></dd><dt><span class="term">Commentaries</span></dt><dd><p>
-Commentaries available include classics like John Wesley's Notes on the Bible,
-and Luther's Commentary on Galatians.
-
-With the <span class="emphasis"><i>Personal</i></span> commentary you can record your own personal
-notes to different parts of the Bible.
-
-</p></dd><dt><span class="term">Lexicons</span></dt><dd><p>
-Lexicons available include: Robinson's Morphological Analysis Codes,
-Brown-Driver-Briggs Hebrew Lexicon, International Standard Bible Encyclopedia
-</p></dd><dt><span class="term">Dictionaries</span></dt><dd><p>
-Dictionaries available include Strong's Hebrew Bible Dictionary, Strong's Greek Bible Dictionary,
-Webster's Revised Unabridged Dictionary of the English Language 1913, Nave's Topical Bible.
-</p></dd><dt><span class="term">Books</span></dt><dd><p>Books available include &quot;Imitation of Christ&quot;, &quot;Enuma Elish&quot;, and &quot;Josephus, the complete works&quot;
-</p></dd></dl></div>
-</p><p>Additional documents are being added to the Sword repository frequently, so visit often.</p><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-intro-changes"></a>Changes</h2></div></div><p>
-Please read the file Changelog of the sourcecode package if you are
-interested in more detailed changes. </p><p>A listing of the features included in the current package can be found
-in the sourcecode at
-<a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/bibletime/bibletime/ChangeLog?rev=HEAD&amp;content-type=text/plain" target="_top">
-CVS log for <tt>bibletime/bibletime/ChangeLog</tt></a></p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="id2779957"></a>Changes for BibleTime Release 1.3</h3></div></div><p>BibleTime version 1.3 provides a number of bugfixes and
-stability improvements.  You will also find a number of changes to
-the appearance of bibletime.  This is a partial list, for a more complete list, 
-see the changlog.</p><div class="section"><div class="titlepage"><div><h4 class="title"><a name="id2779978"></a>Main window</h4></div></div><p>Main index was reorganized, sorting the modules by 
-type of module, then by language.</p><p>Bookmarks are now stored in an XML file, but the
-old format can still be imported.  After upgrading an existing
-installation the old bookmarks are placed in the
-&quot;Old bookmarks&quot; subfolder.</p><p>Drag&amp;Drop works now for more than one item.</p><p>Search default Bible and search open modules options added
-in the search menu.</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="id2780008"></a>Searchdialog</h4></div></div><p>Major redesign of the user interface, reducing the number 
-of tabs to two (search and result).  Features have been
-moved to the appropriate tab.</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="id2780022"></a>Display windows</h4></div></div><p>Separated now in &quot;read only&quot; and &quot;write only&quot; windows. Write
-windows can be opened by right mouse button menu in the main index on the
-Personal Commentary module (or any other RawFiles module).</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="id2778582"></a>Options dialog</h4></div></div><p>A custom font can now be specified for each language.
-The default font is KDE's default font, and will work for most modules.</p></div></div></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="index.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-intro-ToDo.html">Next</a></td></tr><tr><td width="33%" align="left">The BibleTime Handbook </td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right"> ToDo</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-op-MDI-Window.html b/docs/handbook/html/hdbk-op-MDI-Window.html
deleted file mode 100644
index fd2e703..0000000
--- a/docs/handbook/html/hdbk-op-MDI-Window.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<html><head><title>Multiple Document Interface (MDI) Window</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-op.html" title="Chapter 3. Program Operation"><link rel="previous" href="hdbk-op.html" title="Chapter 3. Program Operation"><link rel="next" href="hdbk-op-search.html" title="Searching in Documents"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Multiple Document Interface (MDI) Window</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-op.html">Prev</a></td><td align="center" class="center">Program Operation</td><td align="right" class="right"><a accesskey="n" href="hdbk-op-search.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-op-MDI-Window"></a>Multiple Document Interface (MDI) Window</h2></div></div><p>
-This is where the opened documents are displayed.
-Documents are displayed in &quot;Display Windows&quot;, that are specific to the four types of
-documents. Crosswire Bible Society may release other document types for sword in the
-future. When they are released, BibleTime will support them as well. </p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-MDI-Window-control-modules"></a>Controlling Open Documents</h3></div></div><p>
-Document Windows can be controlled and manipulated with normal KDE window/title bar functions.
-In addition to this, you can tile and cascade open Document Windows. Use the appropriate tool
-bar buttons, or menu functions under <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">&quot;Window&quot;</span> in the main menubar. Document
-Windows can be set to automatically cascade or tile also. </p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-MDI-Window-module-navigation"></a>Navigating in Open Documents</h3></div></div><p>
-Navigation within a document is accomplished with the Document Key
-Control Menu, and the scroll bar.
-</p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>To move to a specific location use the Document Key Control.</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>To move within a section of a document use the scroll bar.</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>For Bible texts the index key is <span class="emphasis"><i>Book - Chapter - Verse</i></span></p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>For commentaries the index key is <span class="emphasis"><i>Book - Chapter - Verse</i></span></p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>For lexicons the index key is <span class="emphasis"><i>Keyword</i></span></p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>Drag &amp; Drop Works Here; if you drag a verse from one open document or a bookmark and drop
-it on another the second document will jump from it's current location to the location
-of the verse or bookmark dragged.</p></div></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-MDI-Window-Personal-commentary"></a>Editing your own commentary</h3></div></div><p>If the personal commentary is opened with a left mouse button it opens
-in read only mode.  If you wish to make entries to the personal commentary, 
-right mouse button on the  brings up the choice of the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">plane
-text or the HTML editors</span>.</p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>If the editor does not save an entry, please check that you
-have permission to write to the personal commentary.</p></div><p>The pencil icon is shown for the commentary editor</p>.
-<span class="inlinemediaobject"><img src="hdbk-op-pencil.png" alt="Enter your notes"></span><p>The personal commentary editors are provided with a search key and save button.
-The HTML editor is also provided with the basic functions font name, size, color, 
-italicize, underline and some paragraph formating possibilities.  As with all good
-modern editors What You See Is What You Get.
-</p><p>
-To delete notes for a selected verse, click the
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">delete verse button</span>
-<span class="inlinemediaobject"><img src="hdbk-op-delete-verse.png" alt="Delete Verse Symbol"></span>.
-</p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>The personal commentary is a sword module.  If you do not find it in the
-main index, get it from  the <a href="http://www.crosswire.org" target="_top">
-Crosswire Bible Society</a>.</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>If you can not write to the personal commentary your permissions for the
-personal commentary module are wrong.  Reset the permissions to allow your user
-to write to it.</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>Drag &amp; Drop Works Here, just like other
-commentaries and Bible texts.</p></div></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-op.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-op-search.html">Next</a></td></tr><tr><td width="33%" align="left">Program Operation </td><td width="34%" align="center"><a href="hdbk-op.html">Up</a></td><td width="33%" align="right"> Searching in Documents</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-op-change-range.png b/docs/handbook/html/hdbk-op-change-range.png
deleted file mode 100644
index 32b4bb8..0000000
--- a/docs/handbook/html/hdbk-op-change-range.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-crch-dia-choose.png b/docs/handbook/html/hdbk-op-crch-dia-choose.png
deleted file mode 100644
index 9302589..0000000
--- a/docs/handbook/html/hdbk-op-crch-dia-choose.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-delete-verse.png b/docs/handbook/html/hdbk-op-delete-verse.png
deleted file mode 100644
index fb04ace..0000000
--- a/docs/handbook/html/hdbk-op-delete-verse.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-module-select-1.png b/docs/handbook/html/hdbk-op-module-select-1.png
deleted file mode 100644
index e05c597..0000000
--- a/docs/handbook/html/hdbk-op-module-select-1.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-module-select-2.png b/docs/handbook/html/hdbk-op-module-select-2.png
deleted file mode 100644
index 6bd281e..0000000
--- a/docs/handbook/html/hdbk-op-module-select-2.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-module-tree-1.png b/docs/handbook/html/hdbk-op-module-tree-1.png
deleted file mode 100644
index f3ffac5..0000000
--- a/docs/handbook/html/hdbk-op-module-tree-1.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-module-tree-bookmark-bookmarkandfolder.png b/docs/handbook/html/hdbk-op-module-tree-bookmark-bookmarkandfolder.png
deleted file mode 100644
index 02369bd..0000000
--- a/docs/handbook/html/hdbk-op-module-tree-bookmark-bookmarkandfolder.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-module-tree-select.html b/docs/handbook/html/hdbk-op-module-tree-select.html
deleted file mode 100644
index d8e0b63..0000000
--- a/docs/handbook/html/hdbk-op-module-tree-select.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<html><head><title>Selecting a document to
-view</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, Bibletime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-op.html" title="Chapter 3. Program Operation"><link rel="previous" href="hdbk-op.html" title="Chapter 3. Program Operation"><link rel="next" href="hdbk-op-MDI-Window.html" title="Multiple Document Interface (MDI) Window"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Selecting a document to
-view</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-op.html">Prev</a></td><td align="center" class="center">Program Operation</td><td align="right" class="right"><a accesskey="n" href="hdbk-op-MDI-Window.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-op-module-tree-select"></a>Selecting a document to
-view</h2></div></div><p>To select a document, left mouse button on the desired document group (Bibles, Commentaries, or
-Lexicons) to display the contents of a document group, right mouse button on the icon for
-the desired group.  To open a document, left mouse button on it's icon.
-</p><div class="screenshot"><div class="mediaobject"><img src="hdbk-op-module-select-1.png"></div></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>Drag &amp; Drop Works Here</p></div><p>
-A document can be opened from an already opened document.
-Simply left mouse button on the verse number (pointer changes to hand) and drag it to the
-module list. Drop it on the name of the module you want to open, and it will
-open that module to the verse you dragged over. If you drag a verse number to an
-already open module, it will automatically jump that module to the verse dragged
-over. This works for Bibles and Commentaries only. </p><p>
-There are two other functions accessible through right mouse button on
-the document name. &quot;About This Module&quot; opens a window with information about copyright and
-other pertinent things about the selected document. &quot;Unlock This Module&quot; opens a small
-dialog for encrypted documents. This allows those with the key to
-enter it to decrypt the document and make it human-readable.  Crosswire Bible
-Society must encrypt modules unless either the copyright holder provides permission for
-distribution as a sword module, or the text has passed into the public domain
-(copyright has expired).  <a href="http://www.crosswire.org/sword/modules/aboutlocked.jsp" target="_top">
-See information on locked modules on the Crosswire Bible Society web site.</a></p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-module-tree-search"></a>Accessing the search
-dialog</h3></div></div><p>
-You can search in a module by right mouse button on the module name in the module
-list and selecting &quot;Search in module(s)&quot;. By shift right mouse button on other module
-names you can select more than one.  Then follow the same procedure to open the
-search dialog. You will be searching in all of these documents.
-A complete description of the operation of the search features can be found.
-</p><div class="screenshot"><div class="mediaobject"><img src="hdbk-op-module-select-2.png"></div></div></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-module-tree-bookmark"></a>Accessing bookmark
-functions</h3></div></div><p>
-<div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>Drag &amp; Drop Works Here</p></div>
-right mouse button on an empty part of the module tree window and select <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">&quot;Create new
-group&quot;</span> to create a new bookmark folder. You can use normal drag 'n' drop
-functions to drag verse numbers from search dialog results to the bookmark folder,
-and to rearrange bookmarks between folders.  There is an import/export function
-for bookmarks also.  From the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">right-mouse-button menu</span>, select &quot;Export
-bookmarks&quot;. This will bring up a dialog box for you to save the bookmark
-collection.  They can be shared with other BibleTime users, archived, etc.  They
-can be imported in the same way. You can also right mouse button to change folder names
-and bookmark descriptions, and delete folders and
-bookmarks. </p><div class="screenshot"><div class="mediaobject"><img src="hdbk-op-module-tree-bookmark-bookmarkandfolder.png"></div></div></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-op.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-op-MDI-Window.html">Next</a></td></tr><tr><td width="33%" align="left">Program Operation </td><td width="34%" align="center"><a href="hdbk-op.html">Up</a></td><td width="33%" align="right"> Multiple Document Interface (MDI) Window</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-op-output.html b/docs/handbook/html/hdbk-op-output.html
deleted file mode 100644
index 0753f7d..0000000
--- a/docs/handbook/html/hdbk-op-output.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<html><head><title>Exporting and Printing</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-op.html" title="Chapter 3. Program Operation"><link rel="previous" href="hdbk-op-search-dialog-text-regexp.html" title="Search Syntax using GCC Regular Expression"><link rel="next" href="hdbk-config.html" title="Chapter 4. Configuring BibleTime"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Exporting and Printing</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-op-search-dialog-text-regexp.html">Prev</a></td><td align="center" class="center">Program Operation</td><td align="right" class="right"><a accesskey="n" href="hdbk-config.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-op-output"></a>Exporting and Printing</h2></div></div><p>Bible Window, Lexicon Window, Commentary Window, Book Window.</p><p>By clicking with the right mouse button on the index key number, 
-verse number or text the Bible Window, Lexicon Window, Commentary Window or Book Window drop down box is
-displayed (depending on which kind of window is current),
-providing options to select all, and the export options copy, 
-add to printing queue, and save.</p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-select-all"></a>Select All</h3></div></div><p>A mouse click here will select all of the text in the chapter displayed
-in the current window.
-</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-copy"></a>Copy</h3></div></div><p>A mouse click here will bring up a sub menu offering to copy to the copy
-buffer using the current location of the cursor as the starting point.
-</p><div class="itemizedlist"><ul type="disc"><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Reference only</span> - The number of the current verse (such as Genesis 1:25).
-</p></li><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Text of Reference</span> - The text of the current verse.
-</p></li><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Reference with Text</span> - Both the text of the current verse, and the verse number.
-</p></li><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Chapter</span> - the entire chapter.
-</p></li><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Selected Text</span> - Only the selected (highlighted) text.
-</p></li></ul></div><p>
-This text can be copied into any application that can access the linux copy buffer.
-</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-print"></a>Add to Printing Queue</h3></div></div><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Important</h3><p>
-Selecting print here puts your print output in the bibletime print buffer.  
-Inorder to send your job to the printer (lpr) via kprinter, you must
-select <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">file</span> <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">print</span> on the
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">menubar</span>.
-</p></div><p>A mouse click here will bring up a submenu with the printing options:
-</p><div class="itemizedlist"><ul type="disc"><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">reference with text</span>
-</p></li><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">chapter</span>
-</p></li></ul></div><p>
-Selecting these places text into the bibletime print queue, but it
-will not print yet.  When all of the items that you desire to print are
-copied to the print queue, select the print icon and the print dialog
-window is displayed.  Now you can select to either view or print the text.
-</p><p>Printing from BibleTime is rather basic and is intended as
-a utility.  If you are composing a document or presentation containing text from
-BibleTime documents, we suggest that you use one of the presentation or editing
-tools on your system to format your work.
-</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-save"></a>Save</h3></div></div><p>A mouse click here will bring up a submenu with save options:
-</p><div class="itemizedlist"><ul type="disc"><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Verse with reference</span> - a file is created in UNIX® formated ASCII text.
-</p></li><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Chapter as plain text</span> - a file is created in UNIX® formated ASCII text.
-</p></li><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Chapter as HTML</span> - a file is created formated in HTML.
-</p></li></ul></div><p>
-Once saved this text can be opened and edited by any text or HTML application.
-</p></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-op-search-dialog-text-regexp.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-config.html">Next</a></td></tr><tr><td width="33%" align="left">Search Syntax using GCC Regular Expression </td><td width="34%" align="center"><a href="hdbk-op.html">Up</a></td><td width="33%" align="right"> Configuring BibleTime</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-op-pencil.png b/docs/handbook/html/hdbk-op-pencil.png
deleted file mode 100644
index 8e2f895..0000000
--- a/docs/handbook/html/hdbk-op-pencil.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-search-dialog-modsel.png b/docs/handbook/html/hdbk-op-search-dialog-modsel.png
deleted file mode 100644
index 49e3f77..0000000
--- a/docs/handbook/html/hdbk-op-search-dialog-modsel.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-search-dialog-options.png b/docs/handbook/html/hdbk-op-search-dialog-options.png
deleted file mode 100644
index 584ec44..0000000
--- a/docs/handbook/html/hdbk-op-search-dialog-options.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-search-dialog-range.png b/docs/handbook/html/hdbk-op-search-dialog-range.png
deleted file mode 100644
index 60b2e89..0000000
--- a/docs/handbook/html/hdbk-op-search-dialog-range.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-search-dialog-searchanal.png b/docs/handbook/html/hdbk-op-search-dialog-searchanal.png
deleted file mode 100644
index 8e9c339..0000000
--- a/docs/handbook/html/hdbk-op-search-dialog-searchanal.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-search-dialog-searchresult.png b/docs/handbook/html/hdbk-op-search-dialog-searchresult.png
deleted file mode 100644
index 7790c92..0000000
--- a/docs/handbook/html/hdbk-op-search-dialog-searchresult.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-search-dialog-searchtext.png b/docs/handbook/html/hdbk-op-search-dialog-searchtext.png
deleted file mode 100644
index 24a9464..0000000
--- a/docs/handbook/html/hdbk-op-search-dialog-searchtext.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-op-search-dialog-text-regexp.html b/docs/handbook/html/hdbk-op-search-dialog-text-regexp.html
deleted file mode 100644
index 80c3a05..0000000
--- a/docs/handbook/html/hdbk-op-search-dialog-text-regexp.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<html><head><title>Search Syntax using GCC Regular Expression</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-op.html" title="Chapter 3. Program Operation"><link rel="previous" href="hdbk-op-search.html" title="Searching in Documents"><link rel="next" href="hdbk-op-output.html" title="Exporting and Printing"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Search Syntax using GCC Regular Expression</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-op-search.html">Prev</a></td><td align="center" class="center">Program Operation</td><td align="right" class="right"><a accesskey="n" href="hdbk-op-output.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-op-search-dialog-text-regexp"></a>Search Syntax using GCC Regular Expression</h2></div></div><p>Regular expression searches provide a way to do simple or
-complex searches for strings that match a pattern or set of
-patterns (branches) separated by vertical bars &quot;|&quot;.
-While a pattern can be built to look for a word or phrase, a
-simple pattern that consists of a word does not look for only
-that word but for any place the string of letters that make that
-word are found. A search for &quot;right&quot; will return verses
-that contain the word &quot;right&quot;, but also &quot;<span class="emphasis"><i>right</i></span>eous&quot;,
-&quot;<span class="emphasis"><i>right</i></span>eousness&quot;, &quot;un<span class="emphasis"><i>right</i></span>eous&quot;,
-&quot;up<span class="emphasis"><i>right</i></span>&quot; and even &quot;b<span class="emphasis"><i>right</i></span>&quot;.
-A search for &quot;hall not&quot; is not a search for
-&quot;hall&quot; AND &quot;not&quot; but for the string
-&quot;hall not&quot; with a space between the second
-&quot;l&quot; and the &quot;n&quot;. The search for &quot;hall
-not&quot; will find occurrences of &quot;s<span class="emphasis"><i>hall not</i></span>&quot;.</p><p>The power of Regular Expressions is in the patterns (or
-templates) used to define a search. A pattern consists of
-ordinary characters and some special characters that are used and
-interpreted by a set of rules. Special characters include
-.\[^*$?+. Ordinary (or simple) characters are any characters that
-are not special. The backslash, &quot;\&quot;, is used to convert
-special characters to ordinary and ordinary characters to
-special. </p><p>Example: the pattern &quot;<span class="emphasis"><i>i. love\.</i></span>&quot;
-will find sentences that end with &quot;h<span class="emphasis"><i>i</i></span>s <span class="emphasis"><i>love</i></span>&quot;
-or &quot;<span class="emphasis"><i>i</i></span>n <span class="emphasis"><i>love</i></span>&quot; or
-&quot;<span class="emphasis"><i>i</i></span>s <span class="emphasis"><i>love</i></span>&quot; followed by
-a period. The first period in &quot;i. love\.&quot; is a special
-character that means allow any character in this position. The
-backslash in &quot;i. love\.&quot; means that the period
-following it is not to be considered a special character, but is
-an ordinary period. </p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-search-dialog-text-regexp-rules"></a>Rules for GCC Regular Expression Search Requests</h3></div></div><div class="itemizedlist"><ul type="disc"><li><p>. The period matches any character. See <a href="hdbk-op-search-dialog-text-regexp.html#period" title="The Period .">Details</a></p></li><li><p>* The asterisk matches 0 or more characters of the
-	preceding: set, character or indicated character. See <a href="hdbk-op-search-dialog-text-regexp.html#asterisk" title="The Asterisk *">Details</a></p></li><li><p>+ The plus sign matches 1 or more characters of the
-	preceding: set, character or indicated character. See <a href="hdbk-op-search-dialog-text-regexp.html#plus" title="The Plus Sign +">Details</a></p></li><li><p>? The question mark matches 0 or 1 character of the
-	preceding: set, character or indicated character. See <a href="hdbk-op-search-dialog-text-regexp.html#question" title="The Question Mark ?">Details</a></p></li><li><p>[ ] Square brackets match any one of the characters
-	specified inside [ ]. See <a href="hdbk-op-search-dialog-text-regexp.html#bracket" title="The Square Brackets [ ]">Details</a></p></li><li><p>^ A caret as the first character inside [ ] means NOT. See
-	<a href="hdbk-op-search-dialog-text-regexp.html#caret" title="The Caret first in Square Brackets [^xxx">Details</a></p></li><li><p>^ A caret beginning a pattern anchors the beginning of a
-	line. See <a href="hdbk-op-search-dialog-text-regexp.html#caret" title="The Caret first in Square Brackets [^xxx">Details</a></p></li><li><p>$ A dollar at the end of a pattern anchors the end of a
-	line. See <a href="hdbk-op-search-dialog-text-regexp.html#dollar" title="The Dollar Sign as End of Line Anchor xxx$">Details</a></p></li><li><p>| A vertical bar means logical OR. See <a href="hdbk-op-search-dialog-text-regexp.html#bar" title="The Vertical Bar |">Details</a></p></li><li><p>( ) Parentheses enclose expressions for grouping.
-<span class="emphasis"><i>Not supported!</i></span></p></li><li><p>\ A backslash can be used prior to any special character
-	to match that character. See <a href="hdbk-op-search-dialog-text-regexp.html#backslash" title="The Backslash Prior to a Special Character \*">Details</a></p></li><li><p>\ A backslash can be used prior to an ordinary character
-	to make it a special character. See <a href="hdbk-op-search-dialog-text-regexp.html#backslash" title="The Backslash Prior to a Special Character \*">Details</a></p></li></ul></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="period"></a>The Period .</h4></div></div><p>The Period &quot;.&quot; will match any single character even
-a space or other non-alphabet character.
-<span class="emphasis"><i>s.t</i></span> matches <span class="emphasis"><i>s</i></span>i<span class="emphasis"><i>t</i></span>,
-<span class="emphasis"><i>s</i></span>e<span class="emphasis"><i>t</i></span>,<span class="emphasis"><i> s</i></span>o<span class="emphasis"><i>t</i></span>,
-etc., which could be located in <span class="emphasis"><i>s</i></span>i<span class="emphasis"><i>t</i></span>ting,
-compas<span class="emphasis"><i>s</i></span>e<span class="emphasis"><i>t</i></span>h and <span class="emphasis"><i>s</i></span>o<span class="emphasis"><i>t</i></span>tish
-<span class="emphasis"><i>b..t</i></span> matches <span class="emphasis"><i>b</i></span>oo<span class="emphasis"><i>t</i></span>,
-<span class="emphasis"><i>b</i></span>oa<span class="emphasis"><i>t</i></span> and <span class="emphasis"><i>b</i></span>ea<span class="emphasis"><i>t
-foot.tool </i></span>matches <span class="emphasis"><i>foot</i></span>s<span class="emphasis"><i>tool </i></span>and
-<span class="emphasis"><i>foot tool</i></span></p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="asterisk"></a>The Asterisk *</h4></div></div><p>The asterisk matches zero or more characters of the preceding:
-set, character or indicated character. Using
-a period asterisk combination &quot;.*&quot; after a commonly
-found pattern can cause the search to take a very long time,
-making the program seem to freeze.
-<span class="emphasis"><i>be*n</i></span> matches<span class="emphasis"><i> beeen, been, ben</i></span>,
-and <span class="emphasis"><i>bn</i></span> which could locate Reu<span class="emphasis"><i>ben</i></span>
-and She<span class="emphasis"><i>bn</i></span>a.</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="plus"></a>The Plus Sign +</h4></div></div><p>The Plus Sign matches one or more characters of the preceding:
-set, character or indicated character. Using
-a period and plus sign combination &quot;.+&quot; after a
-commonly found pattern can cause the search to take a very long
-time, making the program seem to freeze.
-<span class="emphasis"><i>be+n</i></span> matches <span class="emphasis"><i>beeen, been</i></span> and <span class="emphasis"><i>ben</i></span>,
-but not <span class="emphasis"><i>bn</i></span>.</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="question"></a>The Question Mark ?</h4></div></div><p>The Question Mark matches zero or one character of the
-preceding: set, character or indicated character.
-<span class="emphasis"><i>be?n</i></span> matches <span class="emphasis"><i>ben</i></span> and <span class="emphasis"><i>bn</i></span>
-but not <span class="emphasis"><i>been</i></span>.
-<span class="emphasis"><i>trees?</i></span> matches <span class="emphasis"><i>trees</i></span> or <span class="emphasis"><i>tree</i></span>.</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="bracket"></a>The Square Brackets [ ]</h4></div></div><p>The Square Brackets enclose a set of characters that can
-match. The period, asterisk, plus sign and question mark are not
-special inside the brackets. A minus sign can be used to indicate
-a range. If you want a caret &quot;^&quot; to be part of the
-range do not place it first after the left bracket or it will be
-a special character. To include a &quot;]&quot; in the set make
-it the first (or second after a special &quot;^&quot;) character
-in the set. To include a minus sign in the set make it the first
-(or second after a special &quot;^&quot;) or last character in
-the set.
-<span class="emphasis"><i>s[eia]t</i></span> matches <span class="emphasis"><i>set</i></span>, <span class="emphasis"><i>sit</i></span>,
-and <span class="emphasis"><i>sat</i></span>, but not <span class="emphasis"><i>s</i></span>o<span class="emphasis"><i>t</i></span>.
-<span class="emphasis"><i>s[eia]+t </i></span>matches as above but also, <span class="emphasis"><i>seat,
-seet, siet</i></span>, etc.
-<span class="emphasis"><i>[a-d]</i></span> matches <span class="emphasis"><i>a, b, c,</i></span> or <span class="emphasis"><i>d</i></span>.
-<span class="emphasis"><i>[A-Z]</i></span> matches any uppercase letter.
-[.;:?!] matches ., ;, :, ?, or ! but not a comma.
-[ ]^-] matches ] or ^ or -</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="caret"></a>The Caret first in Square Brackets [^xxx</h4></div></div><p>If the Caret is the first character after the left bracket it
-means NOT.
-<span class="emphasis"><i>s[^io]t</i></span> matches <span class="emphasis"><i>set, sat</i></span>, etc.,
-but not <span class="emphasis"><i>s</i></span>i<span class="emphasis"><i>t</i></span> and <span class="emphasis"><i>s</i></span>o<span class="emphasis"><i>t</i></span>.</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="caret-s"></a>The Caret as Start of Line Anchor ^xxx</h4></div></div><p>If the Caret is the first character in a pattern it anchors
-the pattern to the start of a line. Any match must be at the
-beginning of a line. Because of unfiltered
-formatting characters in some texts, this feature does not always
-work, but may if a few periods are placed after the caret to
-account for the formatting characters.
-<span class="emphasis"><i>^In the beginning</i></span> matches lines that
-start with &quot;<span class="emphasis"><i>In the beginning</i></span>&quot;.
-(May need to use: <span class="emphasis"><i>^.....In the beginning</i></span>)</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="dollar"></a>The Dollar Sign as End of Line Anchor xxx$</h4></div></div><p>If the Dollar Sign is the last character in a pattern it
-anchors the pattern to the end of a line. Any match must be at
-the end of a line. Because of unfiltered
-formatting characters in some texts, this feature does not always
-work, but may if a few periods are placed before the dollar sign
-to account for the formatting characters.
-<span class="emphasis"><i>Amen\.$</i></span> matches lines that end with
-&quot;<span class="emphasis"><i>Amen.</i></span>&quot; (May
-need to use Amen\....$, Amen\..........$, or even
-Amen\....................$)</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="bar"></a>The Vertical Bar |</h4></div></div><p>The Vertical Bar between patterns means OR.
-<span class="emphasis"><i>John|Peter</i></span> matches <span class="emphasis"><i>John</i></span> or <span class="emphasis"><i>Peter.
-John .*Peter|Peter .*John</i></span> matches <span class="emphasis"><i>John</i></span>
-... <span class="emphasis"><i>Peter</i></span> or <span class="emphasis"><i>Peter</i></span> ... <span class="emphasis"><i>John</i></span>.
-(.* slows a search)
-<span class="emphasis"><i>pain|suffering|sorrow</i></span> matches <span class="emphasis"><i>pain</i></span>,
-or <span class="emphasis"><i>suffering</i></span>, or <span class="emphasis"><i>sorrow</i></span>.</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="parenth"></a>The Parentheses ( ) </h4></div></div><p><span class="emphasis"><i>The use of Parentheses ( ) is
-not supported!</i></span></p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="backslash"></a>The Backslash Prior to a Special Character \*</h4></div></div><p>The Backslash prior to a special character indicates that the
-character is not being used in its special meaning, but is just
-to match itself.
-<span class="emphasis"><i>amen\.</i></span> matches <span class="emphasis"><i>amen.</i></span> but not <span class="emphasis"><i>amen</i></span>t
-and will not locate firm<span class="emphasis"><i>amen</i></span>t.</p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="backslash-o"></a>The Backslash Prior to an Ordinary Character \s</h4></div></div><p>The Backslash prior to an ordinary character indicates that
-the character is not being used to match itself, but has special
-meaning.</p><div class="itemizedlist"><ul type="disc"><li><p>
-\b if use outside [ ] means word boundary. If used inside [ ] means backspace.
-<span class="emphasis"><i>\brighteous\b</i></span> matches <span class="emphasis"><i>righteous</i></span> but
-not un<span class="emphasis"><i>righteous</i></span> or <span class="emphasis"><i>righteous</i></span>ness</p></li><li><p>\B means non-word boundary.  <span class="emphasis"><i>\Brighteous\B</i></span>
-matches un<span class="emphasis"><i>righteous</i></span>ness and un<span class="emphasis"><i>righteous</i></span>ly
-but not <span class="emphasis"><i>righteous</i></span>, un<span class="emphasis"><i>righteous</i></span> or <span class="emphasis"><i>
-righteous</i></span>ness.</p></li><li><p>\d means digit; same as [0-9].</p></li><li><p>\D means non-digit, same as [^0-9].</p></li><li><p>\s means space. </p></li><li><p>\S means not a space. </p></li><li><p>\w means alphanumeric; same as [a-zA-Z0-9_].</p></li><li><p>\W means not alphanumeric; same as [^a-zA-Z0-9_].</p></li></ul></div></div></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-op-search.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-op-output.html">Next</a></td></tr><tr><td width="33%" align="left">Searching in Documents </td><td width="34%" align="center"><a href="hdbk-op.html">Up</a></td><td width="33%" align="right"> Exporting and Printing</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-op-search.html b/docs/handbook/html/hdbk-op-search.html
deleted file mode 100644
index 0868416..0000000
--- a/docs/handbook/html/hdbk-op-search.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<html><head><title>Searching in Documents</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-op.html" title="Chapter 3. Program Operation"><link rel="previous" href="hdbk-op-MDI-Window.html" title="Multiple Document Interface (MDI) Window"><link rel="next" href="hdbk-op-search-dialog-text-regexp.html" title="Search Syntax using GCC Regular Expression"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Searching in Documents</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-op-MDI-Window.html">Prev</a></td><td align="center" class="center">Program Operation</td><td align="right" class="right"><a accesskey="n" href="hdbk-op-search-dialog-text-regexp.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-op-search"></a>Searching in Documents</h2></div></div><p>Portions of the instructions for the use of GCC Regular Expression in
-Searching Documents is taken from the help files for the
-Microsoft Windows® version of Sword.</p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-search-functions"></a>Accessing search functions</h3></div></div><p>
-You can search in a document by clicking with the right mouse button on the document name in the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Main
-Index</span> and selecting <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Search in module(s)</span>.
-By holding shift- or ctrl- and clicking on other module names you can select more than one.
-Then follow the same procedure to open the search dialog.  You will be searching
-in all of these Documents. </p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-search-dialog"></a>Using the Search Dialog</h3></div></div><p>BibleTime provides a well developed search facility based on
-GCC Regular Expression.  It allows you
-to create almost <a href="hdbk-op-search-dialog-text-regexp.html#hdbk-op-search-dialog-text-regexp" title="Search Syntax using GCC Regular Expression">any
-type of search you can imagine.</a></p><p>To access the search feature, click with the right mouse button in the Main Index now in 
-the drop down select the magnifying glass.  You can also
-customize BibleTime to put the search icon 
-<span class="inlinemediaobject"><img src="find.png"></span>
-in the toolbar if you would prefer.</p><div class="section"><div class="titlepage"><div><h4 class="title"><a name="hdbk-op-search-options"></a>The Options Tab - Setting up your search.</h4></div></div><p>Use the options tab to set up your search.</p><div class="screenshot"><div class="mediaobject"><hr><img src="hdbk-op-search-dialog-options.png"><hr></div></div><div class="section"><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-choose-modules"></a>Using the Choose Modules Button</h5></div></div><p>At the top of the options tab you will find <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Choose Modules</span> , with the already
-selected modules directly below.  If you would like to search additional modules, click on
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Choose Modules</span> and you will be offered a menu of all of the modules that can be searched.
-Select modules with a click in the checkbox, then click the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Use Selected Modules</span> button.
-</p><div class="screenshot"><div class="mediaobject"><hr><img src="hdbk-op-search-dialog-modsel.png"><hr></div></div></div><div class="section"><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-properties"></a>Searched Text - what you want to find.</h5></div></div><p>The text box labled Searched Text is where the phrase to be used
-as the search key is entered.  This phrase may be one or more words, or partial words,
-(separate words, or partials, with a space), a phrase, or pattern 
-<a href="hdbk-op-search-dialog-text-regexp.html#hdbk-op-search-dialog-text-regexp" title="Search Syntax using GCC Regular Expression">(Regular
-Expression).</a>
-
-You can use the radio buttons select to perform the search using
-the search key in multiple word, exact search, or regular expression mode.
-A check box is provided to turn case sensitive search on or off.
-</p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>Drag &amp; Drop Works Here, you can drop verses and bookmarks into the
-text box.  You can also copy and paste text into the text box.</p></div></div><div class="section"><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-dialog-text-input-case"></a>Using the Search Text Case Sensitive checkbox</h5></div></div><p>Click on the Case Sensitive check
-box to toggle case sensitivity on or off. If the box is marked a
-search will only find verse in which the found text also matches
-the case of the text in the input field. If the box is unmarked
-the search will match if the texts match but are different in
-case. To locate &quot;LORD&quot; but not &quot;Lord&quot; or
-&quot;lord&quot; mark the check box. To let &quot;LORD&quot; and
-&quot;Lord&quot; match &quot;lord&quot; leave the check box
-unmarked.</p></div><div class="section"><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-dialog-text-input-multiand"></a>Using the Search Text Multiple Word (AND) Button</h5></div></div><p>If Multiple Words (AND) radio button is marked the search 
-will locate all lines (or verses) that have all the words, listed in the
-Input Field. The position and order of the words, in the line is 
-not a factor. If all the words, are in a line, in any order, even 
-separated by other words, the line will be included in the list of 
-found lines. A search for &quot;prove cause&quot; will find Gen. 
-21:25, &quot;And Abraham re<span class="emphasis"><i>prove</i></span>d Abimelech be
-<span class="emphasis"><i>cause</i></span> of a well of water...&quot; This is 
-because a word that is part of another word is considered found if 
-a word containing it is found.</p></div><div class="section"><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-dialog-text-input-multior"></a>Using the Search Text Multiple Word (OR) Button</h5></div></div><p>If Multiple Words (OR) radio button is marked the search will locate
-all lines (or verses) that have any of the words, listed in the Input 
-Field.  A search for &quot;cause&quot; will find Genesis 21:11,
-&quot;And the thing was very grievous in Abraham's sight be<span class="emphasis"><i>cause
-</i></span> of his son.&quot;</p></div><div class="section"><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-dialog-text-input-phrase"></a>Using the Exact Search</h5></div></div><p>If the Exact radio button is marked the
-search will locate all lines (or verses) that contain what was entered in the
-input field, exactly as entered, including any spaces. The phrase found does not
-have to start or end at a word boundary. A search for &quot;now how
-thou ought&quot; will find 1 Timothy 3:1, &quot;...that thou
-mayest k<span class="emphasis"><i>now how thou ought</i></span>est
-to behave...&quot; </p></div><div class="section"><div class="titlepage"><div><h5 class="title"><a name="hd-op-sch-dia-txt-scope-options"></a><span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Choose Search</span> Scope Options</h5></div></div><p>Define the Scope of your search by clicking on the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Choose Scope</span>
-button.  You will be presented a list of predefined scopes.</p><div class="itemizedlist"><ul type="disc"><li><p><span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">No Scope</span> this turns off the search
-scope tab.  The entire document is searched.</p></li><li><p><span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Last Result</span> The new search will only
-search within the verses found in the previous search.</p></li><li><p><span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Gospels</span> The new search will be
-performed within the range Matthew 1:1 - John 21:25</p></li><li><p><span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">History</span> The new search will be
-performed within the range Joshua 1:1 - Esther 10:3;</p></li></ul></div><p>If <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">No Scope</span> is checked and a search of the KJV Bible module is
-done for the name, Jesus, 939 matches will result. Then if
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Last Result</span> is checked and another search is done for the
-title, Christ, 257 matches from the first 939 matches will
-remain. Then if <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Last Result</span> remains checked and another
-search is done for the title, Lord, 106 matches from the 257 will
-remain. All the remaining 106 matches will have the name, Jesus,
-and both the titles, Christ and Lord.</p></div><div class="section"><div class="titlepage"><div><h5 class="title"><a name="hd-op-sch-dia-txt-scope-maintain"></a>Edit
-Ranges</h5></div></div><p>Setup Custom Ranges - You can enter upper and lower boundaries
-for the search by clicking on the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Setup Custom Ranges</span> button.</p><div class="mediaobject"><hr><img src="hdbk-op-search-dialog-range.png" alt="Change Range Entry Box"><hr></div><p>The predefined ranges show examples of the required syntax.
-</p><p>
-Click on the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Add New Range</span> enter the name for your range in the Name text entry box,
-and enter the range in the text entry box labled Edit the search range.  Your range is now added to
-the list of custom ranges.  If you are satisfied you can return to the Search Options tab by clicking on
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">OK</span>.
-</p><p>A number of custom ranges have been provided.</p><p>The scope of a search can be set to the <span class="emphasis"><i>Entire
-Module</i></span> or the <span class="emphasis"><i>Current Results.</i></span> If
-Entire Module is checked and a search of the KJV Bible module is
-done for the name, Jesus, 939 matches will result. Then if
-Current Results is checked and another search is done for the
-title, Christ, 257 matches from the first 939 matches will
-remain. Then if Current Results remains checked and another
-search is done for the title, Lord, 106 matches from the 257 will
-remain. All the remaining 106 matches will have the name, Jesus,
-and both the titles, Christ and Lord.</p><div class="screenshot"><div class="mediaobject"><hr><img src="hdbk-op-search-dialog-range.png"><hr></div></div></div><div class="section"><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-dialog-text-input-search"></a>Using the Search Text Button</h5></div></div><p>Click on the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Search Button</span> to start
-the search.</p><div class="screenshot"><div class="mediaobject"><hr><img src="hdbk-op-search-dialog-options.png"><hr></div></div></div></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="hdbk-op-search-results"></a>The Search Results Tab</h4></div></div><p>Under the search results tab you will find the all of your search hits.</p><div class="section"><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-dialog-text-result"></a>Using the Search Results Tab</h5></div></div><p>
-Search Result - This tells you first, by module, how many instances of the
-search string were found. In the Module Column, clicking on a document will open the list of
-references (clicking with the right mouse button allows you to copy, save, or print the list of items found).
-Clicking on a reference (the found items list) opens that verse up in the window below.
-Drag the reference and drop it on a document in the main index to open the
-module to that verse in a new display window, or look at the verse in the bottom pane
-of the search results tab.</p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>Drag &amp; Drop Works Here in the text display area.</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>Select verse numbers and drag them to the main index to create bookmarks.</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>Select verse numbers and drop them on an unopened module in the main index
-to open the module and jump to the verse location (Bibles and commentaries only).</p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>Select verse numbers and drag them to an open document and the document will jump
-to the verse location (Bibles and commentaries only).</p></div><div class="screenshot"><div class="mediaobject"><hr><img src="hdbk-op-search-dialog-searchresult.png"><hr></div></div></div><div class="section"><div class="titlepage"><div><h5 class="title"><a name="hdbk-op-search-dialog-text-analysis"></a>Using the Search Analysis</h5></div></div><p>Click on <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Search Analysis</span> to open the search analysis display.</p><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Search Analysis</span> - This gives a graphic analysis of the number of instances the
-search string was found in each book. It can display results for all documents searched.
-You have the option of saving the analysis as an html formated list on
-your hard drive. </p><div class="screenshot"><div class="mediaobject"><hr><img src="hdbk-op-search-dialog-searchanal.png"><hr></div></div></div></div></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-op-MDI-Window.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-op-search-dialog-text-regexp.html">Next</a></td></tr><tr><td width="33%" align="left">Multiple Document Interface (MDI) Window </td><td width="34%" align="center"><a href="hdbk-op.html">Up</a></td><td width="33%" align="right"> Search Syntax using GCC Regular Expression</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-op.html b/docs/handbook/html/hdbk-op.html
deleted file mode 100644
index f82cea2..0000000
--- a/docs/handbook/html/hdbk-op.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<html><head><title>Chapter 3. Program Operation</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="index.html" title="The BibleTime Handbook"><link rel="previous" href="hdbk-start-screen.html" title="Parts of the BibleTime Window"><link rel="next" href="hdbk-op-MDI-Window.html" title="Multiple Document Interface (MDI) Window"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Program Operation</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-start-screen.html">Prev</a></td><td align="center" class="center"> </td><td align="right" class="right"><a accesskey="n" href="hdbk-op-MDI-Window.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="hdbk-op"></a>Chapter 3. Program Operation</h2></div></div><p>
-BibleTime is mainly operated from the Module Tree (this tree is called the
-&quot;Main Index&quot;). The second important place to work with BibleTime is the MDI
-area (MDI = Multiple Document Interface). </p><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-op-module-tree"></a>Main Index</h2></div></div><p>
-This is the pane on the left side of the BibleTime window.
-It contains the tree of installed documents (Sword Modules), as well as any 
-bookmarks you enter.
-</p><div class="screenshot"><div class="mediaobject"><hr><img src="hdbk-op-module-tree-1.png"><hr></div></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-module-tree-select"></a>Selecting a document to
-view</h3></div></div><p>To select a document, click with the left mouse button on the desired
-document group (Bibles, Commentaries, Lexicons, Books, Devotionals or Glossaries) to display the contents of a document group, click with the
-right mouse button on the icon for
-the desired group.  To open a document, click on it's icon.
-</p><div class="screenshot"><div class="mediaobject"><hr><img src="hdbk-op-module-select-1.png"><hr></div></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>Drag &amp; Drop Works Here</p></div><p>
-A document can be opened from an already opened document.
-Simply click with the left mouse button on the verse number (pointer changes to hand) and drag it to the
-module list. Drop it on the name of the module you want to open, and it will
-open that module to the verse you dragged over. If you drag a verse number to an
-already open module, it will automatically jump that module to the location of the verse
-that was dragged over. This works for Bibles and Commentaries only. </p><p>
-There are two other functions accessible through clicking with the right mouse button on
-the document name. &quot;About This Module&quot; opens a window with information about copyright and
-other pertinent things about the selected document. &quot;Unlock This Module&quot; opens a small
-dialog for encrypted documents. This allows those with the key to
-enter it to decrypt the document and make it human-readable.  Crosswire Bible
-Society must encrypt modules unless either the copyright holder provides permission for
-distribution as a sword module, or the text has passed into the public domain
-(copyright has expired).  
-<a href="http://www.crosswire.org/sword/modules/aboutlocked.jsp" target="_top">
-See information on locked modules on the Crosswire Bible Society web site.</a>
-</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-module-tree-search"></a>Accessing the search dialog</h3></div></div><p>
-You can search in a module by clicking with the right
-mouse button on the
-module name in the module list and selecting &quot;Search in module(s)&quot;. By 
-pressing shift and clicking on other module
-names you can select more than one.  Then follow the same procedure to open the
-search dialog. You will be searching in all of these documents.
-A complete description of the operation of the search features can be
-found <a href="hdbk-op-search.html#hdbk-op-search" title="Searching in Documents">here</a>.
-</p><div class="screenshot"><div class="mediaobject"><hr><img src="hdbk-op-module-select-2.png"><hr></div></div></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="hdbk-op-module-tree-bookmark"></a>Accessing bookmark functions</h3></div></div><p>
-<div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>Drag &amp; Drop Works Here</p></div>
-Click with the right mouse button on the bookmark group of the module tree window and select <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">&quot;Create new folder&quot;</span> to create a new bookmark sub folder. You can use normal drag 'n' drop
-functions to drag verse numbers from search dialog results to the bookmark folder,
-and to rearrange bookmarks between folders.  There is an import/export function
-for bookmarks also.  From the <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">right-mouse-button menu</span>, select &quot;Export
-bookmarks&quot;. This will bring up a dialog box for you to save the bookmark
-collection.  They can be shared with other BibleTime users, archived, etc.  They
-can be imported in the same way. You can also click with the right mouse button to change folder names
-and bookmark descriptions, and delete folders and
-bookmarks. </p><div class="screenshot"><div class="mediaobject"><hr><img src="hdbk-op-module-tree-bookmark-bookmarkandfolder.png"><hr></div></div></div></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-start-screen.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-op-MDI-Window.html">Next</a></td></tr><tr><td width="33%" align="left">Parts of the BibleTime Window </td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right"> Multiple Document Interface (MDI) Window</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-start-custom.html b/docs/handbook/html/hdbk-start-custom.html
deleted file mode 100644
index 6aa3cd1..0000000
--- a/docs/handbook/html/hdbk-start-custom.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html><head><title>Startup Customization</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-term.html" title="Chapter 2. Starting BibleTime"><link rel="previous" href="hdbk-term.html" title="Chapter 2. Starting BibleTime"><link rel="next" href="hdbk-start-sequence.html" title="Startup Sequence"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Startup Customization</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-term.html">Prev</a></td><td align="center" class="center">Starting BibleTime</td><td align="right" class="right"><a accesskey="n" href="hdbk-start-sequence.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-start-custom"></a>Startup Customization</h2></div></div><p>
-From a terminal you can use BibleTime to open a random verse in the default bible:</p><p><span class="command"><b>
-bibletime --open-default-bible &quot;&lt;random&gt;&quot;
-</b></span></p><p>
-To open at a given passage use:</p><p>
-<span class="command"><b>
-bibletime --open-default-bible &quot;John 3:16&quot;
-</b></span></p><p>
-You can also use keys in your current bookname language.
-</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-term.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-start-sequence.html">Next</a></td></tr><tr><td width="33%" align="left">Starting BibleTime </td><td width="34%" align="center"><a href="hdbk-term.html">Up</a></td><td width="33%" align="right"> Startup Sequence</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-start-screen-terms.png b/docs/handbook/html/hdbk-start-screen-terms.png
deleted file mode 100644
index b21c230..0000000
--- a/docs/handbook/html/hdbk-start-screen-terms.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-start-screen.html b/docs/handbook/html/hdbk-start-screen.html
deleted file mode 100644
index 6e88d01..0000000
--- a/docs/handbook/html/hdbk-start-screen.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><head><title>Parts of the BibleTime Window</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-term.html" title="Chapter 2. Starting BibleTime"><link rel="previous" href="hdbk-start-sequence.html" title="Startup Sequence"><link rel="next" href="hdbk-op.html" title="Chapter 3. Program Operation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Parts of the BibleTime Window</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-start-sequence.html">Prev</a></td><td align="center" class="center">Starting BibleTime</td><td align="right" class="right"><a accesskey="n" href="hdbk-op.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-start-screen"></a>Parts of the BibleTime Window</h2></div></div><p>
-Now the main BibleTime window will open.  It's operation is covered in the next chapter.
-<div class="mediaobject"><hr><img src="hdbk-start-screen-terms.png" alt="The BibleTime Application Window"><hr></div>
-</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-start-sequence.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-op.html">Next</a></td></tr><tr><td width="33%" align="left">Startup Sequence </td><td width="34%" align="center"><a href="hdbk-term.html">Up</a></td><td width="33%" align="right"> Program Operation</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-start-sequence-tips.png b/docs/handbook/html/hdbk-start-sequence-tips.png
deleted file mode 100644
index 9f55c5e..0000000
--- a/docs/handbook/html/hdbk-start-sequence-tips.png
+++ /dev/null
diff --git a/docs/handbook/html/hdbk-start-sequence.html b/docs/handbook/html/hdbk-start-sequence.html
deleted file mode 100644
index 6a8be5a..0000000
--- a/docs/handbook/html/hdbk-start-sequence.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><head><title>Startup Sequence</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="hdbk-term.html" title="Chapter 2. Starting BibleTime"><link rel="previous" href="hdbk-start-custom.html" title="Startup Customization"><link rel="next" href="hdbk-start-screen.html" title="Parts of the BibleTime Window"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Startup Sequence</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-start-custom.html">Prev</a></td><td align="center" class="center">Starting BibleTime</td><td align="right" class="right"><a accesskey="n" href="hdbk-start-screen.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-start-sequence"></a>Startup Sequence</h2></div></div><p>
-As BibleTime launches you may see some message screens:</p><div class="itemizedlist"><ul type="disc"><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">No Modules Installed</span> - This is shown if you
-have forgotten to install sword modules, or if the sword modules
-can not be found.
-</p></li><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">First Time Startup</span> - This is shown the first time
-BibleTime is launched.
-</p></li><li><p>
-<span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">Daily Tips</span> - These show on every startup, unless
-you turn them off.
-<div class="mediaobject"><hr><img src="hdbk-start-sequence-tips.png" alt="Daily tips"><hr></div>
-</p></li></ul></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-start-custom.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-start-screen.html">Next</a></td></tr><tr><td width="33%" align="left">Startup Customization </td><td width="34%" align="center"><a href="hdbk-term.html">Up</a></td><td width="33%" align="right"> Parts of the BibleTime Window</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hdbk-term.html b/docs/handbook/html/hdbk-term.html
deleted file mode 100644
index 91f7a47..0000000
--- a/docs/handbook/html/hdbk-term.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<html><head><title>Chapter 2. Starting BibleTime</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="up" href="index.html" title="The BibleTime Handbook"><link rel="previous" href="hdbk-intro-motivation.html" title="Motivation"><link rel="next" href="hdbk-start-custom.html" title="Startup Customization"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Starting BibleTime</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="hdbk-intro-motivation.html">Prev</a></td><td align="center" class="center"> </td><td align="right" class="right"><a accesskey="n" href="hdbk-start-custom.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="hdbk-term"></a>Chapter 2. Starting BibleTime</h2></div></div><p>
-BibleTime is a KDE program and is integrated with the KDE desktop.
-You can launch BibleTime from the KDE <span style="background-color: rgb(240,240,240);   color: rgb(0,0,0);">start menu</span> in
-the applications group.
-
-<div class="mediaobject"><hr><img src="hi32-app-bibletime.png" alt="Icon used to start BibleTime"><hr></div>
-
-</p><p>
-BibleTime can also be launched from a terminal command prompt.
-To launch BibleTime open a terminal (any Xterminal inside a KDE3 session) and type
-<span class="command"><b>bibletime</b></span>.
-</p><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="hdbk-start-otherwm"></a>Other Window Managers (not KDE)</h2></div></div><p>
-BibleTime can be launched from inside other window managers
-(like gnome) providing KDE is installed.  You will need to install
-your own icon to launch the program.  See the window manager help
-files to see how.
-</p><p>
-BibleTime can be used with other window managers such as Gnome, BlackBox, Sawfish, providing
-KDE3 is already installed on your computer.  If you installed KDE3 using the
-Linux-Mandrake&#8482; 8.x RPM's from a terminal using the mandrake RPM's KDE3 is installed
-in /opt, so the start up command in a terminal is:</p><pre class="screen">
-export KDEDIR=/opt/kde3
-bibletime
-</pre><p>
-BibleTime will now open inside of a window of the current window manager.
-If you do not have KDE3 installed in your copy of Linux®, you should have tried the
-<a href="http://gnomesword.sourceforge.net/" target="_top">Gnomesword application.</a>, or one 
-of the KDE2 versions of BibleTime.
-</p><p>With Linux-Mandrake&#8482; 9.0 and other other distributions where KDE 3.x is
-installed in the normal location, simply type:</p><pre class="screen">
-bibletime
-</pre>
-in any terminal to launch BibleTime.
-</div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="hdbk-intro-motivation.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="hdbk-start-custom.html">Next</a></td></tr><tr><td width="33%" align="left">Motivation </td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right"> Startup Customization</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/hi32-action-bt_bible.png b/docs/handbook/html/hi32-action-bt_bible.png
deleted file mode 100644
index 7422069..0000000
--- a/docs/handbook/html/hi32-action-bt_bible.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_bible_add.png b/docs/handbook/html/hi32-action-bt_bible_add.png
deleted file mode 100644
index 27f13ef..0000000
--- a/docs/handbook/html/hi32-action-bt_bible_add.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_book.png b/docs/handbook/html/hi32-action-bt_book.png
deleted file mode 100644
index 29af6eb..0000000
--- a/docs/handbook/html/hi32-action-bt_book.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_book_add.png b/docs/handbook/html/hi32-action-bt_book_add.png
deleted file mode 100644
index 29348a8..0000000
--- a/docs/handbook/html/hi32-action-bt_book_add.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_cascade.png b/docs/handbook/html/hi32-action-bt_cascade.png
deleted file mode 100644
index e3fe29e..0000000
--- a/docs/handbook/html/hi32-action-bt_cascade.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_cascade_auto.png b/docs/handbook/html/hi32-action-bt_cascade_auto.png
deleted file mode 100644
index 991e3dd..0000000
--- a/docs/handbook/html/hi32-action-bt_cascade_auto.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_commentary.png b/docs/handbook/html/hi32-action-bt_commentary.png
deleted file mode 100644
index 748f65b..0000000
--- a/docs/handbook/html/hi32-action-bt_commentary.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_commentary_add.png b/docs/handbook/html/hi32-action-bt_commentary_add.png
deleted file mode 100644
index 1f4b728..0000000
--- a/docs/handbook/html/hi32-action-bt_commentary_add.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_displayconfig.png b/docs/handbook/html/hi32-action-bt_displayconfig.png
deleted file mode 100644
index 9a130b1..0000000
--- a/docs/handbook/html/hi32-action-bt_displayconfig.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_lexicon.png b/docs/handbook/html/hi32-action-bt_lexicon.png
deleted file mode 100644
index 2133cc3..0000000
--- a/docs/handbook/html/hi32-action-bt_lexicon.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_lexicon_add.png b/docs/handbook/html/hi32-action-bt_lexicon_add.png
deleted file mode 100644
index 08a1456..0000000
--- a/docs/handbook/html/hi32-action-bt_lexicon_add.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_startconfig.png b/docs/handbook/html/hi32-action-bt_startconfig.png
deleted file mode 100644
index 28f0aa6..0000000
--- a/docs/handbook/html/hi32-action-bt_startconfig.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_swordconfig.png b/docs/handbook/html/hi32-action-bt_swordconfig.png
deleted file mode 100644
index 23fb4c5..0000000
--- a/docs/handbook/html/hi32-action-bt_swordconfig.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_sync.png b/docs/handbook/html/hi32-action-bt_sync.png
deleted file mode 100644
index e5e73b2..0000000
--- a/docs/handbook/html/hi32-action-bt_sync.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_tile.png b/docs/handbook/html/hi32-action-bt_tile.png
deleted file mode 100644
index eb43048..0000000
--- a/docs/handbook/html/hi32-action-bt_tile.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-action-bt_tile_auto.png b/docs/handbook/html/hi32-action-bt_tile_auto.png
deleted file mode 100644
index 28d9f3b..0000000
--- a/docs/handbook/html/hi32-action-bt_tile_auto.png
+++ /dev/null
diff --git a/docs/handbook/html/hi32-app-bibletime.png b/docs/handbook/html/hi32-app-bibletime.png
deleted file mode 100644
index 6d3c54e..0000000
--- a/docs/handbook/html/hi32-app-bibletime.png
+++ /dev/null
diff --git a/docs/handbook/html/index.html b/docs/handbook/html/index.html
deleted file mode 100644
index d662020..0000000
--- a/docs/handbook/html/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html><head><title>The BibleTime Handbook</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, bibletime, BibleTime, sword, crosswire, help dialog"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The BibleTime Handbook"><link rel="next" href="hdbk-intro.html" title="Chapter 1. Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>The BibleTime Handbook</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"></td><td align="center" class="center"> </td><td align="right" class="right"><a accesskey="n" href="hdbk-intro.html">Next</a></td></tr></tbody></table></div></div><div class="book"><div class="titlepage"><div><h1 class="title"><a name="id2778264"></a>The BibleTime Handbook</h1></div><div><h3 class="author">Fred Saalbach <tt>&lt;info@bibletime.info&gt;</tt></h3><h3 class="author">Jeffrey Hoyt </h3></div><div><br>Revision <span class="releaseinfo">1.3<br></span></div><div><p class="copyright">Copyright © 1999, 2000, 2001, 2002, 2003 The team of BibleTime, info@bibletime.info</p></div><div><div class="legalnotice"><p>The BibleTime handbook is part of BibleTime.
-</p><p>
-BibleTime 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.
-</p><p>
-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.
-</p><p>
-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.
-</p></div></div><div><div><div class="abstract"><p>
-BibleTime is an application to aid in study of the Bible.
-
-</p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="hdbk-intro.html">Introduction</a></dt><dd><dl><dt><a href="hdbk-intro.html#hdbk-intro-changes">Changes</a></dt><dd><dl><dt><a href="hdbk-intro.html#id2779957">Changes for BibleTime Release 1.3</a></dt></dl></dd><dt><a href="hdbk-intro-ToDo.html">ToDo</a></dt><dt><a href="hdbk-intro-motivation.html">Motivation</a></dt></dl></dd><dt>2. <a href="hdbk-term.html">Starting BibleTime</a></dt><dd><dl><dt><a href="hdbk-term.html#hdbk-start-otherwm">Other Window Managers (not KDE)</a></dt><dt><a href="hdbk-start-custom.html">Startup Customization</a></dt><dt><a href="hdbk-start-sequence.html">Startup Sequence</a></dt><dt><a href="hdbk-start-screen.html">Parts of the BibleTime Window</a></dt></dl></dd><dt>3. <a href="hdbk-op.html">Program Operation</a></dt><dd><dl><dt><a href="hdbk-op.html#hdbk-op-module-tree">Main Index</a></dt><dd><dl><dt><a href="hdbk-op.html#hdbk-op-module-tree-select">Selecting a document to
-view</a></dt><dt><a href="hdbk-op.html#hdbk-op-module-tree-search">Accessing the search dialog</a></dt><dt><a href="hdbk-op.html#hdbk-op-module-tree-bookmark">Accessing bookmark functions</a></dt></dl></dd><dt><a href="hdbk-op-MDI-Window.html">Multiple Document Interface (MDI) Window</a></dt><dd><dl><dt><a href="hdbk-op-MDI-Window.html#hdbk-op-MDI-Window-control-modules">Controlling Open Documents</a></dt><dt><a href="hdbk-op-MDI-Window.html#hdbk-op-MDI-Window-module-navigation">Navigating in Open Documents</a></dt><dt><a href="hdbk-op-MDI-Window.html#hdbk-op-MDI-Window-Personal-commentary">Editing your own commentary</a></dt></dl></dd><dt><a href="hdbk-op-search.html">Searching in Documents</a></dt><dd><dl><dt><a href="hdbk-op-search.html#hdbk-op-search-functions">Accessing search functions</a></dt><dt><a href="hdbk-op-search.html#hdbk-op-search-dialog">Using the Search Dialog</a></dt></dl></dd><dt><a href="hdbk-op-search-dialog-text-regexp.html">Search Syntax using GCC Regular Expression</a></dt><dd><dl><dt><a href="hdbk-op-search-dialog-text-regexp.html#hdbk-op-search-dialog-text-regexp-rules">Rules for GCC Regular Expression Search Requests</a></dt></dl></dd><dt><a href="hdbk-op-output.html">Exporting and Printing</a></dt><dd><dl><dt><a href="hdbk-op-output.html#hdbk-op-select-all">Select All</a></dt><dt><a href="hdbk-op-output.html#hdbk-op-copy">Copy</a></dt><dt><a href="hdbk-op-output.html#hdbk-op-print">Add to Printing Queue</a></dt><dt><a href="hdbk-op-output.html#hdbk-op-save">Save</a></dt></dl></dd></dl></dd><dt>4. <a href="hdbk-config.html">Configuring BibleTime</a></dt><dd><dl><dt><a href="hdbk-config.html#hdbk-config-toolbar">Configure Toolbars Dialog</a></dt><dt><a href="hdbk-config-bt.html">Preferences - BibleTime Dialog</a></dt><dd><dl><dt><a href="hdbk-config-bt.html#hdbk-config-bt-startup">Startup</a></dt><dt><a href="hdbk-config-bt.html#hdbk-config-bt-fonts">Fonts</a></dt><dt><a href="hdbk-config-bt.html#hdbk-config-bt-Colors">Colors</a></dt><dt><a href="hdbk-config-bt.html#hdbk-config-bt-profiles">Sessions</a></dt><dt><a href="hdbk-config-bt.html#hdbk-config-bt-sword">Sword</a></dt></dl></dd><dt><a href="hdbk-config-bt-Accelerators.html">Accelerators</a></dt></dl></dd><dt>5. <a href="hdbk-bars.html">Main toolbar and menubar</a></dt><dd><dl><dt><a href="hdbk-bars.html#hdbk-bars-toolbar">Toolbar</a></dt><dt><a href="hdbk-bars-toolbar-action.html">Button Action</a></dt><dt><a href="hdbk-bars-menubar.html">Menubar</a></dt><dd><dl><dt><a href="hdbk-bars-menubar.html#hdbk-bars-menubar-file">File</a></dt><dt><a href="hdbk-bars-menubar.html#hdbk-bars-menubar-view">View</a></dt><dt><a href="hdbk-bars-menubar.html#hdbk-bars-menubar-mainindex">Search</a></dt><dt><a href="hdbk-bars-menubar.html#hdbk-bars-menubar-Window">Window</a></dt><dt><a href="hdbk-bars-menubar.html#hdbk-bars-menubar-settings">Settings</a></dt><dt><a href="hdbk-bars-menubar.html#hdbk-bars-menubar-Help">Help</a></dt></dl></dd></dl></dd></dl></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"></td><td width="34%" align="center" valign="top"> </td><td width="33%" align="right" valign="top"><a href="hdbk-intro.html">Next</a></td></tr><tr><td width="33%" align="left"> </td><td width="34%" align="center"> </td><td width="33%" align="right"> Introduction</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/handbook/html/kcmfontinst.png b/docs/handbook/html/kcmfontinst.png
deleted file mode 100644
index b123250..0000000
--- a/docs/handbook/html/kcmfontinst.png
+++ /dev/null
diff --git a/docs/handbook/html/key_bindings.png b/docs/handbook/html/key_bindings.png
deleted file mode 100644
index 49bf5f6..0000000
--- a/docs/handbook/html/key_bindings.png
+++ /dev/null
diff --git a/docs/handbook/html/ktip.png b/docs/handbook/html/ktip.png
deleted file mode 100644
index 4b38d5d..0000000
--- a/docs/handbook/html/ktip.png
+++ /dev/null
diff --git a/docs/handbook/html/pencil.png b/docs/handbook/html/pencil.png
deleted file mode 100644
index 8e2f895..0000000
--- a/docs/handbook/html/pencil.png
+++ /dev/null
diff --git a/docs/handbook/html/queue.png b/docs/handbook/html/queue.png
deleted file mode 100644
index 96745cd..0000000
--- a/docs/handbook/html/queue.png
+++ /dev/null
diff --git a/docs/handbook/html/start.png b/docs/handbook/html/start.png
deleted file mode 100644
index 9bf7f03..0000000
--- a/docs/handbook/html/start.png
+++ /dev/null
diff --git a/docs/handbook/html/view_sidetree.png b/docs/handbook/html/view_sidetree.png
deleted file mode 100644
index 791d657..0000000
--- a/docs/handbook/html/view_sidetree.png
+++ /dev/null
diff --git a/docs/handbook/html/window_fullscreen.png b/docs/handbook/html/window_fullscreen.png
deleted file mode 100644
index 3163acc..0000000
--- a/docs/handbook/html/window_fullscreen.png
+++ /dev/null
diff --git a/docs/handbook/unicode/Makefile.am b/docs/handbook/unicode/Makefile.am
deleted file mode 100644
index 6199c64..0000000
--- a/docs/handbook/unicode/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = hdbk-config.docbook hdbk-intro.docbook hdbk-operation.docbook hdbk-start.docbook hdbk-toolbars.docbook index.docbook 
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  hdbk-config.docbook hdbk-intro.docbook hdbk-operation.docbook hdbk-start.docbook hdbk-toolbars.docbook index.docbook; do \
-	  $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook; \
-	  chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	done;
-	ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;\
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  hdbk-config.docbook hdbk-intro.docbook hdbk-operation.docbook hdbk-start.docbook hdbk-toolbars.docbook index.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;
diff --git a/docs/handbook/unicode/Makefile.in b/docs/handbook/unicode/Makefile.in
deleted file mode 100644
index 0b0de8a..0000000
--- a/docs/handbook/unicode/Makefile.in
+++ /dev/null
@@ -1,511 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = hdbk-config.docbook hdbk-intro.docbook hdbk-operation.docbook hdbk-start.docbook hdbk-toolbars.docbook index.docbook 
-subdir = docs/handbook/unicode
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/handbook/unicode/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/handbook/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/handbook/unicode/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-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:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-data-local 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 uninstall-local
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  hdbk-config.docbook hdbk-intro.docbook hdbk-operation.docbook hdbk-start.docbook hdbk-toolbars.docbook index.docbook; do \
-	  $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook; \
-	  chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	done;
-	ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;\
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  hdbk-config.docbook hdbk-intro.docbook hdbk-operation.docbook hdbk-start.docbook hdbk-toolbars.docbook index.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/handbook/common;
-# 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:
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/handbook/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/handbook/unicode/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/docs/handbook/unicode/hdbk-config.docbook b/docs/handbook/unicode/hdbk-config.docbook
deleted file mode 100644
index 362ed21..0000000
--- a/docs/handbook/unicode/hdbk-config.docbook
+++ /dev/null
@@ -1,283 +0,0 @@
-<chapter id="hdbk-config"><title>Configuring &bibletime;</title>
-
-<para>The &bibletime; user interface can be customized in many ways
-depending on your needs.  To access the configuration dialogs, in the
-main toolbar select <guimenu>settings</guimenu>. From here select
-<guimenuitem>configure toolbars</guimenuitem> to launch the dialog
-configure toolbars dialog, or select <guimenuitem>Configure &bibletime;</guimenuitem>
-to launch the options dialog.</para>
-
-	<section id="hdbk-config-toolbar"><title>Configure Toolbars Dialog</title>
-	<para>The Configure Toolbars dialog allows adding and removing actions from
-	the main toolbar of &bibletime;. The order of actions in the main toolbar
-	can also be changed.</para>
-	<mediaobject>
-		<imageobject>
-		<imagedata fileref="hdbk-config-toolbar.png" format="PNG"/>
-		</imageobject>
-		<textobject>
-		<phrase>Toolbar Configuration Dialog</phrase>
-		</textobject>
-		<caption>
-		<para>The Toolbar Configuration dialog.</para>
-		</caption>
-	</mediaobject>
-	</section>
-
-	<section id="hdbk-config-bt"><title>Preferences - &bibletime; Dialog</title>
-	<para>The preferences dialog allows many &bibletime; and &sword;
-	features to be customized.</para>
-
-		<section id="hdbk-config-bt-startup"><title>Startup</title>
-		<para>The startup behavior can be customized.
-		Select from the following options:</para>
-		<simplelist>
-		<member>Show tip of the day</member>
-		<member>Show startup Logo</member>
-		<member>Restore windows from the last &bibletime; session</member>
-		</simplelist>
-		<mediaobject>
-		<imageobject>
-		<imagedata fileref="hdbk-conf-optdialog-start.png" format="PNG"/>
-		</imageobject>
-		<textobject>
-		<phrase>Preferences Dialog</phrase>
-		</textobject>
-		<caption>
-		<para>The Preferences dialog - Startup.</para>
-		</caption>
-		</mediaobject>
-		</section>
-		<section id="hdbk-config-bt-fonts"><title>Fonts</title>
-		<para>&bibletime; uses the &kde; general display font.
-		The &kde; general display font can be changed from the &kcontrolcenter;.
-		If the module you are using does not display correctly with the general display font,
-		use the fonts options dialog to select a different one. &bibletime; now 
-		applies font selections to specific languages.
-		</para>
-		<mediaobject>
-		<imageobject>
-		<imagedata fileref="hdbk-conf-optdialog-fonts.png" format="PNG"/>
-		</imageobject>
-		<textobject>
-		<phrase>Options Dialog - fonts</phrase>
-		</textobject>
-		<caption>
-		<para>The Options dialog - Fonts.</para>
-		</caption>
-		</mediaobject>
-
-			<section id="hdbk-config-bt-fonts-what"><title>What kind of fonts can I use?</title>
-			<para>&bibletime; can now use any system fonts.  These may be Bitmap Fonts, 
-			<trademark class="registered">Adobe</trademark> Type1 Fonts, 
-			<trademark class="registered">Adobe</trademark> Type3 fonts, or 
-			<trademark class="registered">TrueType</trademark>.  These fonts may be supplied
-			with your distribution, or may be obtained separately.</para>
-
-			<para>As long as the modules you are interested in display correctly nothing
-			needs to be done here.  If a module you are interested in displays as a series 
-			of question marks (???????????????????) or empty boxes the font available to 
-			&bibletime; does not contain the characters used in your document.</para>
-
-			<para>In the fonts options dialog, choose the desired language from the drop down menu.
-			Select the use custom font checkbox.  Now select a font.  Clearlyu supports most 
-			languages so it is a good first try.  If no installed font can be found that 
-			displays the module you are interested in, try installing the &kde; localization
-			package for that language.</para></section>
-			
-			<section id="hdbk-config-bt-addfont"><title>Installing fonts</title>
-			<para>Detailed font installation instructions are outside the scope of this handbook.
-			If you need detailed font installation information, please read the
-			<ulink url="http://pegasus.rutgers.edu/~elflord/font_howto">Font-HOWTO</ulink>, and
-			<ulink url="http://www.ibiblio.org/pub/Linux/docs/HOWTO/other-formats/html_single/Unicode-HOWTO.html#toc4">
-			The Unicode HOWTO</ulink></para>
-
-			<tip><para>If your distribution includes a font installer use it, it makes
-			font installation much easier!</para></tip>
-
-			<tip><para>If you use a small font like clearlyu (about 22kb) &bibletime;
-			will run faster than if a large font like 
-			<trademark class="registered">Bitstream Cyberbit</trademark> (about 12Mb)
-			is used.</para></tip></section>
-
-			<section id="hdbk-config-bt-ob-font"><title>Obtaining Fonts</title>
-			<para>Fonts can be obtained from a number of sources.</para>
-			<itemizedlist>
-			<listitem><para>Your distribution.</para></listitem>
-			<listitem><para>Your distribution's localization packages.</para></listitem>
-			<listitem><para>An existing &Microsoft; &Windows; installation on the same computer.</para></listitem>
-			<listitem><para>A font collection, such as are available from 
-			<trademark class="registered">Adobe</trademark> or
-			<trademark class="registered">Bitstream</trademark>.</para></listitem>
-			<listitem><para>On line font collections.</para></listitem>
-			</itemizedlist>
-
-			<para>Unicode fonts support more characters than other fonts, so are
-			generally a good choice for &bibletime;, some of these fonts are
-			available at no charge.  Few of the fonts available include all of range of symbols
-			defined in the Unicode standard, so you may try several before finding what you need</para>
-			<para>Here is a listing of some of the fonts available:</para>
-				<table>
-				<title>Unicode Fonts</title>
-				<tgroup cols="2">
-				<tbody>
-				<row><entry>Clearlyu</entry>
-				<entry>Included in some distributions. Contains European, Greek, Hebrew, Thai.
-				Does not contain Chinease pictographs, or Arabic</entry></row>
-
-				<row><entry><ulink url="ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS">ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS</ulink>.</entry>
-				<entry>Several fonts available from the Crosswire Bible Society ftp site.</entry></row>
-
-				<row><entry><ulink url="ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/">Bitstream CyberBit</ulink></entry>
-				<entry>Covers almost the entire range of Unicode.</entry></row>
-
-				<row><entry><ulink url="http://bibliofile.mc.duke.edu/gww/fonts/Unicode.html">Caslon, Monospace, Cupola, Caliban</ulink></entry>
-				<entry>Partial coverage, see information on linked site.</entry></row>
-				</tbody>
-				</tgroup>
-				</table>
-				
-			<para>The most complete listing of Unicode fonts that we are aware of is
-			<ulink url="http://www.ccss.de/slovo/unifonts.htm">
-			Christoph Singer's  "Multilingual Unicode TrueType Fonts in the Internet"</ulink> with 24 fonts listed.</para>
-			<para>Another Unicode font list can be found at:
-			<ulink url="http://www.hclrss.demon.co.uk/unicode/fontsbyrange.html">
-			Unicode Font List</ulink>.
-			</para>
-			</section>
-		</section>
-		<section id="hdbk-config-bt-Colors"><title>Colors</title>
-		<para>The colors of the objects in display windows can be customized.
-		Objects that can be customized are:</para>
-		<simplelist>
-		<member>Text</member>
-		<member>Highlighted verse</member>
-		<member>Footnotes</member>
-		<member>Morphological Tags</member>
-		<member>Background</member>
-		<member>Hyperlinks</member>
-		<member>Strong's Numbers</member>
-		<member>Words of Jesus</member>
-		</simplelist>
-
-		<para>Some options like "Words of Jesus" only apply to texts which
-		support this special feature.</para>
-		<mediaobject>
-		<imageobject>
-		<imagedata fileref="hdbk-conf-optdialog-color.png" format="PNG"/>
-		</imageobject>
-		<textobject>
-		<phrase>Options Dialog - Color</phrase>
-		</textobject>
-		<caption>
-		<para>The Options dialog - Color.</para>
-		</caption>
-		</mediaobject>
-
-		</section>
-
-		<section id="hdbk-config-bt-profiles"><title>Sessions</title>
-		<para>Sessions define the appearance of the work area, for example which
-		windows are open and which texts should be displayed in these windows.
-		Once a session is created, use the menu item <guimenu>Window</guimenu> ->
-		<guimenuitem>Save session</guimenuitem> to save a current session into a
-		session file. Use <guimenu>Window</guimenu> -> <guimenuitem>Load session</guimenuitem> to
-		load a previously saved session into &bibletime;.</para>
-		</section>
-
-		<section id="hdbk-config-bt-sword"><title>Sword</title>
-		<para>Many features provided by the Sword backend can now be customized in
-		&bibletime;.</para>
-		<mediaobject>
-		<imageobject>
-		<imagedata fileref="hdbk-conf-optdialog-sword.png" format="PNG"/>
-		</imageobject>
-		<textobject>
-		<phrase>Options Dialog - Sword</phrase>
-		</textobject>
-		<caption>
-		<para>The Options dialog - Sword.</para>
-		</caption>
-		</mediaobject>
-
-		<section id="hdbk-config-bt-sword-gen"><title>Sword General</title>
-		<para>Key Cache for Lexicons</para>
-		<para>&bibletime; can create a key cache for lexicons.  This speeds up
-		opening large lexicon modules.  The cache file does use some disc space,
-		so if your computer has only a small amount of free space, you might want
-		to disable this feature.</para>
-
-		<para>Scrolling Behavior</para>
-		<para>The default is that a down arrow moves the current position in a text to
-		the next verse.  This option allows the down arrow to move the current
-		position in a text to the previous verse.</para>
-
-		<para>Specify a language for biblical book names</para>
-		<para>This feature allows the language used to displayed book names
-		to be changed.  For example the King James Version can be displayed
-		with German book names.  If your language is not displayed and you would
-		like to create a sword locale for your language, please see the
-		CrossWire Bible Society developers site for details.</para>
-		</section>
-
-
-		<section id="hdbk-config-bt-sword-mod"><title>Sword Default Modules</title>
-		<para>Default modules are specified here.</para>
-		</section>
-		<section id="hdbk-config-bt-sword-filter"><title>Sword Filter Settings</title>
-		<para>Filters control the appearance of text in the display windows.
-		Here you can chose the default settings for the various filters.</para>
-		<para>The items controlled by filters are:</para>
-
-			<itemizedlist>
-			<listitem><para>Show line break after each verse</para></listitem>
-			<listitem><para>Show verse numbers</para></listitem>
-			<listitem><para>Show footnotes</para></listitem>
-			<listitem><para>Show Strong's numbers</para></listitem>
-			<listitem><para>Show headings</para></listitem>
-			<listitem><para>Show morphologic tags</para></listitem>
-			<listitem><para>Show lemmas</para></listitem>
-			<listitem><para>Show Hebrew vowel points</para></listitem>
-			<listitem><para>Show Hebrew cantillation marks</para></listitem>
-			<listitem><para>Show Greek accents</para></listitem>
-			</itemizedlist>
-
-		</section>
-		</section>
-	</section>
-
-	<section id="hdbk-config-bt-Accelerators"><title>Accelerators</title>
-	<para>Accelerators are special key commands that can be used in the place of
-	the menu items and icons. A number of &bibletime;'s commands have
-	predefined Accelerators. All of &bibletime;'s commands can be assigned
-	accelerators here.</para>
-
-		<table>
-		<title>Default accelerators</title>
-		<tgroup cols="2">
-		<thead>
-		<row>
-		<entry>Action</entry>
-		<entry>Key combination</entry>
-		</row>
-		</thead>
-
-		<tbody>
-		<row>
-		<entry>Auto Tile</entry><entry>Ctrl+Alt+T</entry></row>
-		<row><entry>Auto Cascade </entry><entry>Ctrl+Alt+A </entry></row>
-		<row><entry>Cascade </entry><entry>Ctrl+A </entry></row>
-		<row><entry>Close All </entry><entry>Shift+Ctrl+A</entry></row>
-		<row><entry>Configure Toolbars</entry><entry></entry></row>
-		<row><entry>Preferences </entry><entry></entry></row>
-		<row><entry>Quit </entry><entry>Ctrl+Q</entry></row>
-		<row><entry>Remove Selected Item(s)</entry><entry>Ctrl+Alt+D</entry></row>
-		<row><entry>Reset Main Index </entry><entry>Ctrl+Alt+R</entry></row>
-		<row><entry>Search in Selected Module(s) </entry><entry>Ctrl+Alt+S</entry></row>
-		<row><entry>Tile </entry><entry>Ctrl+T </entry></row>
-		</tbody>
-		</tgroup>
-		</table>
-	</section>
-
-</chapter>
diff --git a/docs/handbook/unicode/hdbk-intro.docbook b/docs/handbook/unicode/hdbk-intro.docbook
deleted file mode 100644
index b3295d3..0000000
--- a/docs/handbook/unicode/hdbk-intro.docbook
+++ /dev/null
@@ -1,166 +0,0 @@
-<chapter id="hdbk-intro"><title>Introduction</title>
-
-<para>
-&bibletime; is a powerful Bible study tool written for the &kde; environment on the
-Linux operating system. It is based on the <ulink
-url="http://www.crosswire.org/sword">Sword</ulink> library, which provides the back-end
-functionality for &bibletime;, such as viewing Bible text, searching, bookmarking,
-etc. Sword is the flagship product of the <ulink
-url="http://www.crosswire.org">Crosswire Bible Society</ulink>. </para>
-
-<para>&bibletime; is designed to be used with documents that have been encoded in
-Theological Markup Language (ThML) and General Bible Format (GBF).  These markup
-languages are focused on the requirements of religious texts.
-Complete information on the supported document formats can be found in the <ulink
-url="http://www.crosswire.org/sword/develop/index.jsp">
-developers section of the Sword Project, Crosswire Bible Society</ulink>.</para>
-
-<para>
-Over 200 documents in 50 languages are available from the <ulink
-url="http://www.crosswire.org">Crosswire Bible Society</ulink>.   These include:
-</para>
-
-<para>
-<variablelist>
-<varlistentry>
-<term>Bibles</term>
-<listitem>
-<para>
-The full Bible text, with optional things like Strong's Numbers and footnotes in the text.  The Strong
-Numbers hot link to the entry in Strong's Hebrew Bible Dictionary or Strong's Greek Bible Dictionary.
-Bibles are available in many languages, and include not only modern versions, but also 
-Ancient texts like the Aleppo Codex (Hebrew), and the Septuagint (Greek).
-</para>
-</listitem></varlistentry>
-
-<varlistentry>
-<term>Commentaries</term>
-<listitem>
-<para>
-Commentaries available include classics like John Wesley's Notes on the Bible,
-and Luther's Commentary on Galatians.
-
-With the <emphasis>Personal</emphasis> commentary you can record your own personal
-notes to different parts of the Bible.
-
-</para> 
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Lexicons</term>
-<listitem>
-<para>
-Lexicons available include: Robinson's Morphological Analysis Codes,
-Brown-Driver-Briggs Hebrew Lexicon, International Standard Bible Encyclopedia
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>Dictionaries</term>
-<listitem>
-<para>
-Dictionaries available include Strong's Hebrew Bible Dictionary, Strong's Greek Bible Dictionary,
-Webster's Revised Unabridged Dictionary of the English Language 1913, Nave's Topical Bible.
-</para>
-</listitem>
-</varlistentry>
-<varlistentry>
-<term>Books</term>
-<listitem>
-<para>Books available include &quot;Imitation of Christ&quot;, &quot;Enuma Elish&quot;, and &quot;Josephus, the complete works&quot;
-</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</para>
-<para>Additional documents are being added to the &sword; repository frequently, so visit often.</para>
-
-<section id="hdbk-intro-changes"><title>Changes</title>
-<para>
-Please read the file Changelog of the sourcecode package if you are
-interested in more detailed changes. </para>
-
-<para>A listing of the features included in the current package can be found
-in the sourcecode at
-<ulink url="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/*checkout*/bibletime/bibletime/ChangeLog?rev=HEAD&amp;content-type=text/plain">
-CVS log for <filename>bibletime/bibletime/ChangeLog</filename></ulink></para>
-
-<section><title>Changes for &bibletime; Release 1.3</title>
-<para>&bibletime; version 1.3 provides a number of bugfixes and
-stability improvements.  You will also find a number of changes to
-the appearance of bibletime.  This is a partial list, for a more complete list, 
-see the changlog.</para>
-
-<section><title>Main window</title>
-<para>Main index was reorganized, sorting the modules by 
-type of module, then by language.</para>
-
-<para>Bookmarks are now stored in an XML file, but the
-old format can still be imported.  After upgrading an existing
-installation the old bookmarks are placed in the
-"Old bookmarks" subfolder.</para>
-
-<para>Drag&amp;Drop works now for more than one item.</para>
-
-<para>Search default Bible and search open modules options added
-in the search menu.</para>
-</section>
-
-<section><title>Searchdialog</title>
-<para>Major redesign of the user interface, reducing the number 
-of tabs to two (search and result).  Features have been
-moved to the appropriate tab.</para>
-</section>
-<section><title>Display windows</title>
-<para>Separated now in &quot;read only&quot; and &quot;write only&quot; windows. Write
-windows can be opened by <mousebutton>right</mousebutton> mouse button menu in the main index on the
-Personal Commentary module (or any other RawFiles module).</para>
-</section>
-<section><title>Options dialog</title>
-<para>A custom font can now be specified for each language.
-The default font is KDE's default font, and will work for most modules.</para>
-</section>
-</section>
-</section>
-
-
-<section id="hdbk-intro-ToDo"><title>ToDo</title>
-<para>
-We have lots to do. Because we are a very small team of active developers it's
-very hard to get reasonable results in a short time. If you are interested in
-helping the &bibletime; team, please contact us at
-<ulink url="http://sourceforge.net/pm/?group_id=954">Sourceforge &bibletime; home page</ulink>.
-Information can also be found at <ulink url="http://www.bibletime.info/">the &bibletime;
-homepage</ulink>.</para>
-
-<para>The &bibletime; project needs programmers / developers, translators, reviewers, testers, and
-prayer warriors.  If you can help with any of these tasks or think up another, please join us.
-Without your help, &bibletime; will develop very very slow and it will take
-a very long time until you get a full-featured Bible study tool.
-</para>
-</section>
-
-<section id="hdbk-intro-motivation"><title>Motivation</title>
-<para>
-Our desire is to serve God, and to do our part to help others grow in their
-relationship with Him. We have found a gaping hole, in that there has been a
-total lack of user-friendly Bible-study software available for &Linux;-based
-computers. We have developed &bibletime; to fill that void.
-We have striven to make this a powerful, quality program, and still make it
-simple and intuitive to operate. It is our desire that God be praised, as He is
-the source of all good things.
-</para>
-
-<blockquote><attribution>James 1:17, NASB</attribution>
-<para>Every good thing given and every perfect gift is from above,
-coming down from the Father of lights, with whom there is no
-variation or shifting shadow.</para>
-</blockquote>
-
-<para>
-God bless you as you use this program, and may He be glorified by the work of
-our hands!
-</para>
-</section>
-</chapter>
diff --git a/docs/handbook/unicode/hdbk-operation.docbook b/docs/handbook/unicode/hdbk-operation.docbook
deleted file mode 100644
index ef5b88e..0000000
--- a/docs/handbook/unicode/hdbk-operation.docbook
+++ /dev/null
@@ -1,832 +0,0 @@
-<chapter id="hdbk-op"><title>Program Operation</title>
-<para>
-&bibletime; is mainly operated from the Module Tree (this tree is called the
-"Main Index"). The second important place to work with &bibletime; is the MDI
-area (MDI = Multiple Document Interface). </para>
-
-<section id="hdbk-op-module-tree">
-<title>Main Index</title>
-<para>
-This is the pane on the left side of the &bibletime; window.
-It contains the tree of installed documents (Sword Modules), as well as any 
-bookmarks you enter.
-</para>
-<screenshot>
-<screeninfo>Module Tree</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-module-tree-1.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-
-
-<section id="hdbk-op-module-tree-select">
-<title>Selecting a document to
-view</title>
-<para>To select a document, click with the <mousebutton>left</mousebutton> mouse button on the desired
-document group (Bibles, Commentaries, Lexicons, Books, Devotionals or Glossaries) to display the contents of a document group, click with the
-<mousebutton>right</mousebutton> mouse button on the icon for
-the desired group.  To open a document, click on it's icon.
-</para>
-<screenshot>
-<screeninfo>Document Selection</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-module-select-1.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-<tip><para>Drag &amp; Drop Works Here</para></tip>
-<para>
-A document can be opened from an already opened document.
-Simply click with the <mousebutton>left</mousebutton> mouse button on the verse number (pointer changes to hand) and drag it to the
-module list. Drop it on the name of the module you want to open, and it will
-open that module to the verse you dragged over. If you drag a verse number to an
-already open module, it will automatically jump that module to the location of the verse
-that was dragged over. This works for Bibles and Commentaries only. </para>
-<para>
-There are two other functions accessible through clicking with the <mousebutton>right</mousebutton> mouse button on
-the document name. "About This Module" opens a window with information about copyright and
-other pertinent things about the selected document. "Unlock This Module" opens a small
-dialog for encrypted documents. This allows those with the key to
-enter it to decrypt the document and make it human-readable.  Crosswire Bible
-Society must encrypt modules unless either the copyright holder provides permission for
-distribution as a sword module, or the text has passed into the public domain
-(copyright has expired).  
-<ulink url="http://www.crosswire.org/sword/modules/aboutlocked.jsp">
-See information on locked modules on the Crosswire Bible Society web site.</ulink>
-</para>
-</section>
-
-<section id="hdbk-op-module-tree-search">
-<title>Accessing the search dialog</title> <para>
-You can search in a module by clicking with the <mousebutton>right</mousebutton>
-mouse button on the
-module name in the module list and selecting "Search in module(s)". By 
-pressing shift and clicking on other module
-names you can select more than one.  Then follow the same procedure to open the
-search dialog. You will be searching in all of these documents.
-A complete description of the operation of the search features can be
-found <link linkend="hdbk-op-search">here</link>.
-</para>
-<screenshot>
-<screeninfo>Bookmark Selection</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-module-select-2.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-</section>
-
-
-<section id="hdbk-op-module-tree-bookmark">
-<title>Accessing bookmark functions</title>
-<para>
-<tip><para>Drag &amp; Drop Works Here</para></tip>
-Click with the <mousebutton>right</mousebutton> mouse button on the bookmark group of the module tree window and select <guimenuitem>&quot;Create new folder&quot;</guimenuitem> to create a new bookmark sub folder. You can use normal drag 'n' drop
-functions to drag verse numbers from search dialog results to the bookmark folder,
-and to rearrange bookmarks between folders.  There is an import/export function
-for bookmarks also.  From the <guimenu>right-mouse-button menu</guimenu>, select &quot;Export
-bookmarks&quot;. This will bring up a dialog box for you to save the bookmark
-collection.  They can be shared with other &bibletime; users, archived, etc.  They
-can be imported in the same way. You can also click with the <mousebutton>right</mousebutton> mouse button to change folder names
-and bookmark descriptions, and delete folders and
-bookmarks. </para>
-<screenshot>
-<screeninfo>Bookmark Selection</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-module-tree-bookmark-bookmarkandfolder.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-</section>
-</section>
-
-
-<section id="hdbk-op-MDI-Window">
-<title>Multiple Document Interface (MDI) Window</title>
-<para>
-This is where the opened documents are displayed.
-Documents are displayed in "Display Windows", that are specific to the four types of
-documents. Crosswire Bible Society may release other document types for sword in the
-future. When they are released, &bibletime; will support them as well. </para>
-
-<section id="hdbk-op-MDI-Window-control-modules">
-<title>Controlling Open Documents</title> <para>
-Document Windows can be controlled and manipulated with normal &kde; window/title bar functions.
-In addition to this, you can tile and cascade open Document Windows. Use the appropriate tool
-bar buttons, or menu functions under <guimenu>&quot;Window&quot;</guimenu> in the main menubar. Document
-Windows can be set to automatically cascade or tile also. </para>
-</section>
-
-<section id="hdbk-op-MDI-Window-module-navigation">
-<title>Navigating in Open Documents</title> <para>
-Navigation within a document is accomplished with the Document Key
-Control Menu, and the scroll bar.
-</para>
-<tip><para>To move to a specific location use the Document Key Control.</para></tip>
-<tip><para>To move within a section of a document use the scroll bar.</para></tip>
-<tip><para>For Bible texts the index key is <emphasis>Book - Chapter - Verse</emphasis></para></tip>
-<tip><para>For commentaries the index key is <emphasis>Book - Chapter - Verse</emphasis></para></tip>
-<tip><para>For lexicons the index key is <emphasis>Keyword</emphasis></para></tip>
-<tip><para>Drag &amp; Drop Works Here; if you drag a verse from one open document or a bookmark and drop
-it on another the second document will jump from it's current location to the location
-of the verse or bookmark dragged.</para></tip>
-</section>
-
-<section id="hdbk-op-MDI-Window-Personal-commentary">
-<title>Editing your own commentary</title> 
-<para>If the personal commentary is opened with a <mousebutton>left</mousebutton> mouse button it opens
-in read only mode.  If you wish to make entries to the personal commentary, 
-<mousebutton>right</mousebutton> mouse button on the <menuchoice>personal
-commentary</menuchoice> brings up the choice of the <guimenuitem>plane
-text or the HTML editors</guimenuitem>.</para>
-<tip><para>If the editor does not save an entry, please check that you
-have permission to write to the personal commentary.</para></tip>
-<para>The pencil icon is shown for the commentary editor</para>.
-<inlinemediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-pencil.png"/>
-</imageobject>
-<textobject>
-<phrase>Enter your notes</phrase>
-</textobject>
-</inlinemediaobject>
-<para>The personal commentary editors are provided with a search key and save button.
-The HTML editor is also provided with the basic functions font name, size, color, 
-italicize, underline and some paragraph formating possibilities.  As with all good
-modern editors What You See Is What You Get.
-</para>
-<para>
-To delete notes for a selected verse, click the
-<guibutton>delete verse button</guibutton>
-<inlinemediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-delete-verse.png"/>
-</imageobject>
-<textobject>
-<phrase>Delete Verse Symbol</phrase>
-</textobject>
-</inlinemediaobject>.
-</para>
-<!-- This is a feature not yet finished.
-You can also set the endpoint of your notes, if for example you want
-to use the same notes to comment on a range of verses. Click the "Edit" button
-again to return to normal commentary browsing mode.
--->
-
-<tip><para>The personal commentary is a sword module.  If you do not find it in the
-main index, get it from  the <ulink url="http://www.crosswire.org">
-Crosswire Bible Society</ulink>.</para></tip>
-<tip><para>If you can not write to the personal commentary your permissions for the
-personal commentary module are wrong.  Reset the permissions to allow your user
-to write to it.</para></tip>
-<tip><para>Drag &amp; Drop Works Here, just like other
-commentaries and Bible texts.</para></tip>
-</section>
-
-</section>
-
-
-<section id="hdbk-op-search">
-<title>Searching in Documents</title>
-<para>Portions of the instructions for the use of GCC Regular Expression in
-Searching Documents is taken from the help files for the
-<trademark class="registered">Microsoft Windows</trademark> version of &sword;.</para>
-
-<section id="hdbk-op-search-functions">
-<title>Accessing search functions</title>
-<para>
-You can search in a document by clicking with the <mousebutton>right</mousebutton> mouse button on the document name in the <guimenu>Main
-Index</guimenu> and selecting <guimenuitem>Search in module(s)</guimenuitem>.
-By holding shift- or ctrl- and clicking on other module names you can select more than one.
-Then follow the same procedure to open the search dialog.  You will be searching
-in all of these Documents. </para>
-</section>
-
-
-
-<section id="hdbk-op-search-dialog">
-<title>Using the Search Dialog</title>
-<para>&bibletime; provides a well developed search facility based on
-<application>GCC Regular Expression</application>.  It allows you
-to create almost <link linkend="hdbk-op-search-dialog-text-regexp">any
-type of search you can imagine.</link></para>
-<para>To access the search feature, click with the <mousebutton>right</mousebutton> mouse button in the Main Index now in 
-the drop down select the magnifying glass.  You can also
-customize &bibletime; to put the search icon 
-<inlinemediaobject>
-<imageobject>
-<imagedata fileref="find.png" format="PNG"/>
-</imageobject>
-</inlinemediaobject>
-in the toolbar if you would prefer.</para>
-
-
-<section id="hdbk-op-search-options">
-<title>The Options Tab - Setting up your search.</title>
-<para>Use the options tab to set up your search.</para>
-<screenshot>
-<screeninfo>Search Text Dialog Options Tab</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-search-dialog-options.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-
-
-<section id="hdbk-op-search-choose-modules">
-<title>Using the Choose Modules Button</title>
-<para>At the top of the options tab you will find <guibutton>Choose Modules</guibutton> , with the already
-selected modules directly below.  If you would like to search additional modules, click on
-<guibutton>Choose Modules</guibutton> and you will be offered a menu of all of the modules that can be searched.
-Select modules with a click in the checkbox, then click the <guibutton>Use Selected Modules</guibutton> button.
-</para>
-
-<screenshot>
-<screeninfo>Choose Modules Dialog Box</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-search-dialog-modsel.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-</section>
-
-<section id="hdbk-op-search-properties">
-<title>Searched Text - what you want to find.</title>
-
-<para>The text box labled Searched Text is where the phrase to be used
-as the search key is entered.  This phrase may be one or more words, or partial words,
-(separate words, or partials, with a space), a phrase, or pattern 
-<link linkend="hdbk-op-search-dialog-text-regexp">(Regular
-Expression).</link>
-
-You can use the radio buttons select to perform the search using
-the search key in multiple word, exact search, or regular expression mode.
-A check box is provided to turn case sensitive search on or off.
-</para>
-
-<tip><para>Drag &amp; Drop Works Here, you can drop verses and bookmarks into the
-text box.  You can also copy and paste text into the text box.</para></tip>
-</section>
-
-<section id="hdbk-op-search-dialog-text-input-case">
-<title>Using the Search Text Case Sensitive checkbox</title>
-<para>Click on the Case Sensitive check
-box to toggle case sensitivity on or off. If the box is marked a
-search will only find verse in which the found text also matches
-the case of the text in the input field. If the box is unmarked
-the search will match if the texts match but are different in
-case. To locate &quot;LORD&quot; but not &quot;Lord&quot; or
-&quot;lord&quot; mark the check box. To let &quot;LORD&quot; and
-&quot;Lord&quot; match &quot;lord&quot; leave the check box
-unmarked.</para>
-</section>
-
-
-
-<section id="hdbk-op-search-dialog-text-input-multiand">
-<title>Using the Search Text Multiple Word (AND) Button</title>
-<para>If Multiple Words (AND) radio button is marked the search 
-will locate all lines (or verses) that have all the words, listed in the
-Input Field. The position and order of the words, in the line is 
-not a factor. If all the words, are in a line, in any order, even 
-separated by other words, the line will be included in the list of 
-found lines. A search for &quot;prove cause&quot; will find Gen. 
-21:25, &quot;And Abraham re<emphasis>prove</emphasis>d Abimelech be
-<emphasis>cause</emphasis> of a well of water...&quot; This is 
-because a word that is part of another word is considered found if 
-a word containing it is found.</para>
-</section>
-
-<section id="hdbk-op-search-dialog-text-input-multior">
-<title>Using the Search Text Multiple Word (OR) Button</title>
-<para>If Multiple Words (OR) radio button is marked the search will locate
-all lines (or verses) that have any of the words, listed in the Input 
-Field.  A search for &quot;cause&quot; will find Genesis 21:11,
-&quot;And the thing was very grievous in Abraham's sight be<emphasis>cause
-</emphasis> of his son.&quot;</para>
-</section>
-
-<section id="hdbk-op-search-dialog-text-input-phrase">
-<title>Using the Exact Search</title>
-<para>If the Exact radio button is marked the
-search will locate all lines (or verses) that contain what was entered in the
-input field, exactly as entered, including any spaces. The phrase found does not
-have to start or end at a word boundary. A search for &quot;now how
-thou ought&quot; will find 1 Timothy 3:1, &quot;...that thou
-mayest k<emphasis>now how thou ought</emphasis>est
-to behave...&quot; </para>
-</section>
-
-
-<section id="hd-op-sch-dia-txt-scope-options">
-<title><guibutton>Choose Search</guibutton> Scope Options</title>
-<para>Define the Scope of your search by clicking on the <guibutton>Choose Scope</guibutton>
-button.  You will be presented a list of predefined scopes.</para>
-
-<itemizedlist>
-<listitem><para><guibutton>No Scope</guibutton> this turns off the search
-scope tab.  The entire document is searched.</para></listitem>
-<listitem><para><guibutton>Last Result</guibutton> The new search will only
-search within the verses found in the previous search.</para></listitem>
-<listitem><para><guibutton>Gospels</guibutton> The new search will be
-performed within the range Matthew 1:1 - John 21:25</para></listitem>
-<listitem><para><guibutton>History</guibutton> The new search will be
-performed within the range Joshua 1:1 - Esther 10:3;</para></listitem>
-</itemizedlist>
-
-<para>If <guibutton>No Scope</guibutton> is checked and a search of the KJV Bible module is
-done for the name, Jesus, 939 matches will result. Then if
-<guibutton>Last Result</guibutton> is checked and another search is done for the
-title, Christ, 257 matches from the first 939 matches will
-remain. Then if <guibutton>Last Result</guibutton> remains checked and another
-search is done for the title, Lord, 106 matches from the 257 will
-remain. All the remaining 106 matches will have the name, Jesus,
-and both the titles, Christ and Lord.</para>
-</section>
-
-<section id="hd-op-sch-dia-txt-scope-maintain"><title>Edit
-Ranges</title><para>Setup Custom Ranges - You can enter upper and lower boundaries
-for the search by clicking on the <guibutton>Setup Custom Ranges</guibutton> button.</para>
-
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-search-dialog-range.png" format="PNG"/>
-</imageobject>
-<textobject>
-<phrase>Change Range Entry Box</phrase>
-</textobject>
-</mediaobject>
-
-<para>The predefined ranges show examples of the required syntax.
-</para>
-<para>
-Click on the <guibutton>Add New Range</guibutton> enter the name for your range in the Name text entry box,
-and enter the range in the text entry box labled Edit the search range.  Your range is now added to
-the list of custom ranges.  If you are satisfied you can return to the Search Options tab by clicking on
-<guibutton>OK</guibutton>.
-</para>
-
-<para>A number of custom ranges have been provided.</para>
-
-<para>The scope of a search can be set to the <emphasis>Entire
-Module</emphasis> or the <emphasis>Current Results.</emphasis> If
-Entire Module is checked and a search of the KJV Bible module is
-done for the name, Jesus, 939 matches will result. Then if
-Current Results is checked and another search is done for the
-title, Christ, 257 matches from the first 939 matches will
-remain. Then if Current Results remains checked and another
-search is done for the title, Lord, 106 matches from the 257 will
-remain. All the remaining 106 matches will have the name, Jesus,
-and both the titles, Christ and Lord.</para>
-
-<!-- NOT YET WORKING in 1.3, but a good idea
-<tip><para>Drag &amp; Drop Works Here; you can drop
-verse numbers, and bookmarks into the custom range entry field.
-You can also paste text into the entry field.</para></tip>
--->
-<screenshot>
-<screeninfo>Search TextCustom Range Dialog Box</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-search-dialog-range.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-</section>
-
-<section id="hdbk-op-search-dialog-text-input-search">
-<title>Using the Search Text Button</title>
-<para>Click on the <guibutton>Search Button</guibutton> to start
-the search.</para>
-<screenshot>
-<screeninfo>Search Text Dialog Box</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-search-dialog-options.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-</section>
-</section>
-
-<section id="hdbk-op-search-results">
-<title>The Search Results Tab</title>
-<para>Under the search results tab you will find the all of your search hits.</para>
-
-
-<section id="hdbk-op-search-dialog-text-result">
-<title>Using the Search Results Tab</title>
-<para>
-Search Result - This tells you first, by module, how many instances of the
-search string were found. In the Module Column, clicking on a document will open the list of
-references (clicking with the <mousebutton>right</mousebutton> mouse button allows you to copy, save, or print the list of items found).
-Clicking on a reference (the found items list) opens that verse up in the window below.
-Drag the reference and drop it on a document in the main index to open the
-module to that verse in a new display window, or look at the verse in the bottom pane
-of the search results tab.</para>
-
-<tip><para>Drag &amp; Drop Works Here in the text display area.</para></tip>
-
-<tip><para>Select verse numbers and drag them to the main index to create bookmarks.</para></tip>
-<tip><para>Select verse numbers and drop them on an unopened module in the main index
-to open the module and jump to the verse location (Bibles and commentaries only).</para></tip>
-<tip><para>Select verse numbers and drag them to an open document and the document will jump
-to the verse location (Bibles and commentaries only).</para></tip>
-
-<screenshot>
-<screeninfo>Search Result Dialog Box</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-search-dialog-searchresult.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-</screenshot>
-</section>
-
-
-<section id="hdbk-op-search-dialog-text-analysis">
-<title>Using the Search Analysis</title>
-<para>Click on <guibutton>Search Analysis</guibutton> to open the search analysis display.</para>
-<para>
-<guibutton>Search Analysis</guibutton> - This gives a graphic analysis of the number of instances the
-search string was found in each book. It can display results for all documents searched.
-You have the option of saving the analysis as an html formated list on
-your hard drive. </para>
-<screenshot>
-<screeninfo>Search Analysis Dialog Box</screeninfo>
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-op-search-dialog-searchanal.png" format="PNG"/>
-</imageobject>
-</mediaobject>
-
-</screenshot>
-</section>
-</section>
-</section>
-</section>
-
-<section id="hdbk-op-search-dialog-text-regexp">
-<title>Search Syntax using GCC Regular Expression</title>
-
-<para>Regular expression searches provide a way to do simple or
-complex searches for strings that match a pattern or set of
-patterns (branches) separated by vertical bars &quot;|&quot;.
-While a pattern can be built to look for a word or phrase, a
-simple pattern that consists of a word does not look for only
-that word but for any place the string of letters that make that
-word are found. A search for &quot;right&quot; will return verses
-that contain the word &quot;right&quot;, but also &quot;<emphasis>right</emphasis>eous&quot;,
-&quot;<emphasis>right</emphasis>eousness&quot;, &quot;un<emphasis>right</emphasis>eous&quot;,
-&quot;up<emphasis>right</emphasis>&quot; and even &quot;b<emphasis>right</emphasis>&quot;.
-A search for &quot;hall not&quot; is not a search for
-&quot;hall&quot; AND &quot;not&quot; but for the string
-&quot;hall not&quot; with a space between the second
-&quot;l&quot; and the &quot;n&quot;. The search for &quot;hall
-not&quot; will find occurrences of &quot;s<emphasis>hall not</emphasis>&quot;.</para>
-
-<para>The power of Regular Expressions is in the patterns (or
-templates) used to define a search. A pattern consists of
-ordinary characters and some special characters that are used and
-interpreted by a set of rules. Special characters include
-.\[^*$?+. Ordinary (or simple) characters are any characters that
-are not special. The backslash, &quot;\&quot;, is used to convert
-special characters to ordinary and ordinary characters to
-special. </para>
-
-<para>Example: the pattern &quot;<emphasis>i. love\.</emphasis>&quot;
-will find sentences that end with &quot;h<emphasis>i</emphasis>s <emphasis>love</emphasis>&quot;
-or &quot;<emphasis>i</emphasis>n <emphasis>love</emphasis>&quot; or
-&quot;<emphasis>i</emphasis>s <emphasis>love</emphasis>&quot; followed by
-a period. The first period in &quot;i. love\.&quot; is a special
-character that means allow any character in this position. The
-backslash in &quot;i. love\.&quot; means that the period
-following it is not to be considered a special character, but is
-an ordinary period. </para>
-
-<section id="hdbk-op-search-dialog-text-regexp-rules">
-<title>Rules for GCC Regular Expression Search Requests</title>
-<itemizedlist>
-<listitem><para>. The period matches any character. See <link
-	linkend="period">Details</link></para></listitem>
-<listitem><para>* The asterisk matches 0 or more characters of the
-	preceding: set, character or indicated character. See <link
-	linkend="asterisk">Details</link></para></listitem>
-<listitem><para>+ The plus sign matches 1 or more characters of the
-	preceding: set, character or indicated character. See <link
-	linkend="plus">Details</link></para></listitem>
-<listitem><para>? The question mark matches 0 or 1 character of the
-	preceding: set, character or indicated character. See <link
-	linkend="question">Details</link></para></listitem>
-<listitem><para>[ ] Square brackets match any one of the characters
-	specified inside [ ]. See <link linkend="bracket">Details</link></para></listitem>
-<listitem><para>^ A caret as the first character inside [ ] means NOT. See
-	<link linkend="caret">Details</link></para></listitem>
-<listitem><para>^ A caret beginning a pattern anchors the beginning of a
-	line. See <link linkend="caret">Details</link></para></listitem>
-<listitem><para>$ A dollar at the end of a pattern anchors the end of a
-	line. See <link linkend="dollar">Details</link></para></listitem>
-<listitem><para>| A vertical bar means logical OR. See <link
-	linkend="bar">Details</link></para></listitem>
-<listitem><para>( ) Parentheses enclose expressions for grouping.
-<emphasis>Not supported!</emphasis></para></listitem>
-<listitem><para>\ A backslash can be used prior to any special character
-	to match that character. See <link linkend="backslash">Details</link></para></listitem>
-<listitem><para>\ A backslash can be used prior to an ordinary character
-	to make it a special character. See <link linkend="backslash">Details</link></para></listitem>
-</itemizedlist>
-
-<section id="period">
-<title>The Period .</title>
-
-<para>The Period &quot;.&quot; will match any single character even
-a space or other non-alphabet character.
-<emphasis>s.t</emphasis> matches <emphasis>s</emphasis>i<emphasis>t</emphasis>,
-<emphasis>s</emphasis>e<emphasis>t</emphasis>,<emphasis> s</emphasis>o<emphasis>t</emphasis>,
-etc., which could be located in <emphasis>s</emphasis>i<emphasis>t</emphasis>ting,
-compas<emphasis>s</emphasis>e<emphasis>t</emphasis>h and <emphasis>s</emphasis>o<emphasis>t</emphasis>tish
-<emphasis>b..t</emphasis> matches <emphasis>b</emphasis>oo<emphasis>t</emphasis>,
-<emphasis>b</emphasis>oa<emphasis>t</emphasis> and <emphasis>b</emphasis>ea<emphasis>t
-foot.tool </emphasis>matches <emphasis>foot</emphasis>s<emphasis>tool </emphasis>and
-<emphasis>foot tool</emphasis></para>
-</section>
-
-
-<section id="asterisk">
-<title>The Asterisk *</title>
-
-<para>The asterisk matches zero or more characters of the preceding:
-set, character or indicated character. Using
-a period asterisk combination &quot;.*&quot; after a commonly
-found pattern can cause the search to take a very long time,
-making the program seem to freeze.
-<emphasis>be*n</emphasis> matches<emphasis> beeen, been, ben</emphasis>,
-and <emphasis>bn</emphasis> which could locate Reu<emphasis>ben</emphasis>
-and She<emphasis>bn</emphasis>a.</para>
-</section>
-
-
-<section id="plus">
-<title>The Plus Sign +</title>
-<para>The Plus Sign matches one or more characters of the preceding:
-set, character or indicated character. Using
-a period and plus sign combination &quot;.+&quot; after a
-commonly found pattern can cause the search to take a very long
-time, making the program seem to freeze.
-<emphasis>be+n</emphasis> matches <emphasis>beeen, been</emphasis> and <emphasis>ben</emphasis>,
-but not <emphasis>bn</emphasis>.</para>
-</section>
-
-
-<section id="question">
-<title>The Question Mark ?</title>
-<para>The Question Mark matches zero or one character of the
-preceding: set, character or indicated character.
-<emphasis>be?n</emphasis> matches <emphasis>ben</emphasis> and <emphasis>bn</emphasis>
-but not <emphasis>been</emphasis>.
-<emphasis>trees?</emphasis> matches <emphasis>trees</emphasis> or <emphasis>tree</emphasis>.</para>
-</section>
-
-
-<section id="bracket">
-<title>The Square Brackets [ ]</title>
-<para>The Square Brackets enclose a set of characters that can
-match. The period, asterisk, plus sign and question mark are not
-special inside the brackets. A minus sign can be used to indicate
-a range. If you want a caret &quot;^&quot; to be part of the
-range do not place it first after the left bracket or it will be
-a special character. To include a &quot;]&quot; in the set make
-it the first (or second after a special &quot;^&quot;) character
-in the set. To include a minus sign in the set make it the first
-(or second after a special &quot;^&quot;) or last character in
-the set.
-<emphasis>s[eia]t</emphasis> matches <emphasis>set</emphasis>, <emphasis>sit</emphasis>,
-and <emphasis>sat</emphasis>, but not <emphasis>s</emphasis>o<emphasis>t</emphasis>.
-<emphasis>s[eia]+t </emphasis>matches as above but also, <emphasis>seat,
-seet, siet</emphasis>, etc.
-<emphasis>[a-d]</emphasis> matches <emphasis>a, b, c,</emphasis> or <emphasis>d</emphasis>.
-<emphasis>[A-Z]</emphasis> matches any uppercase letter.
-[.;:?!] matches ., ;, :, ?, or ! but not a comma.
-[ ]^-] matches ] or ^ or -</para>
-</section>
-
-
-<section id="caret">
-<title>The Caret first in Square Brackets [^xxx</title>
-<para>If the Caret is the first character after the left bracket it
-means NOT.
-<emphasis>s[^io]t</emphasis> matches <emphasis>set, sat</emphasis>, etc.,
-but not <emphasis>s</emphasis>i<emphasis>t</emphasis> and <emphasis>s</emphasis>o<emphasis>t</emphasis>.</para>
-</section>
-
-<section id="caret-s">
-<title>The Caret as Start of Line Anchor ^xxx</title>
-<para>If the Caret is the first character in a pattern it anchors
-the pattern to the start of a line. Any match must be at the
-beginning of a line. Because of unfiltered
-formatting characters in some texts, this feature does not always
-work, but may if a few periods are placed after the caret to
-account for the formatting characters.
-<emphasis>^In the beginning</emphasis> matches lines that
-start with &quot;<emphasis>In the beginning</emphasis>&quot;.
-(May need to use: <emphasis>^.....In the beginning</emphasis>)</para>
-</section>
-
-
-<section id="dollar">
-<title>The Dollar Sign as End of Line Anchor xxx$</title>
-<para>If the Dollar Sign is the last character in a pattern it
-anchors the pattern to the end of a line. Any match must be at
-the end of a line. Because of unfiltered
-formatting characters in some texts, this feature does not always
-work, but may if a few periods are placed before the dollar sign
-to account for the formatting characters.
-<emphasis>Amen\.$</emphasis> matches lines that end with
-&quot;<emphasis>Amen.</emphasis>&quot; (May
-need to use Amen\....$, Amen\..........$, or even
-Amen\....................$)</para>
-</section>
-
-
-<section id="bar">
-<title>The Vertical Bar |</title>
-<para>The Vertical Bar between patterns means OR.
-<emphasis>John|Peter</emphasis> matches <emphasis>John</emphasis> or <emphasis>Peter.
-John .*Peter|Peter .*John</emphasis> matches <emphasis>John</emphasis>
-... <emphasis>Peter</emphasis> or <emphasis>Peter</emphasis> ... <emphasis>John</emphasis>.
-(.* slows a search)
-<emphasis>pain|suffering|sorrow</emphasis> matches <emphasis>pain</emphasis>,
-or <emphasis>suffering</emphasis>, or <emphasis>sorrow</emphasis>.</para>
-</section>
-
-
-<section id="parenth">
-<title>The Parentheses ( ) </title>
-<para><emphasis>The use of Parentheses ( ) is
-not supported!</emphasis></para>
-</section>
-
-
-<section id="backslash">
-<title>The Backslash Prior to a Special Character \*</title>
-<para>The Backslash prior to a special character indicates that the
-character is not being used in its special meaning, but is just
-to match itself.
-<emphasis>amen\.</emphasis> matches <emphasis>amen.</emphasis> but not <emphasis>amen</emphasis>t
-and will not locate firm<emphasis>amen</emphasis>t.</para>
-</section>
-
-<section id="backslash-o">
-<title>The Backslash Prior to an Ordinary Character \s</title>
-
-<para>The Backslash prior to an ordinary character indicates that
-the character is not being used to match itself, but has special
-meaning.</para>
-
-<itemizedlist>
-<listitem><para>
-\b if use outside [ ] means word boundary. If used inside [ ] means backspace.
-<emphasis>\brighteous\b</emphasis> matches <emphasis>righteous</emphasis> but
-not un<emphasis>righteous</emphasis> or <emphasis>righteous</emphasis>ness</para></listitem>
-<listitem><para>\B means non-word boundary.  <emphasis>\Brighteous\B</emphasis>
-matches un<emphasis>righteous</emphasis>ness and un<emphasis>righteous</emphasis>ly
-but not <emphasis>righteous</emphasis>, un<emphasis>righteous</emphasis> or <emphasis>
-righteous</emphasis>ness.</para></listitem>
-<listitem><para>\d means digit; same as [0-9].</para></listitem>
-<listitem><para>\D means non-digit, same as [^0-9].</para></listitem>
-<listitem><para>\s means space. </para></listitem>
-<listitem><para>\S means not a space. </para></listitem>
-<listitem><para>\w means alphanumeric; same as [a-zA-Z0-9_].</para></listitem>
-<listitem><para>\W means not alphanumeric; same as [^a-zA-Z0-9_].</para></listitem>
-</itemizedlist>
-</section>
-</section>
-</section>
-
-<section id="hdbk-op-output">
-<title>Exporting and Printing</title>
-<para>Bible Window, Lexicon Window, Commentary Window, Book Window.</para>
-<para>By clicking with the <mousebutton>right</mousebutton> mouse button on the index key number, 
-verse number or text the Bible Window, Lexicon Window, Commentary Window or Book Window drop down box is
-displayed (depending on which kind of window is current),
-providing options to select all, and the export options copy, 
-add to printing queue, and save.</para>
-
-<section id="hdbk-op-select-all">
-<title>Select All</title>
-<para>A mouse click here will select all of the text in the chapter displayed
-in the current window.
-</para>
-</section>
-
-<section id="hdbk-op-copy">
-<title>Copy</title>
-<para>A mouse click here will bring up a sub menu offering to copy to the copy
-buffer using the current location of the cursor as the starting point.
-</para>
-<itemizedlist>
-<listitem>
-<para>
-<guimenuitem>Reference only</guimenuitem> - The number of the current verse (such as Genesis 1:25).
-</para>
-</listitem>
-<listitem>
-<para>
-<guimenuitem>Text of Reference</guimenuitem> - The text of the current verse.
-</para>
-</listitem>
-<listitem>
-<para>
-<guimenuitem>Reference with Text</guimenuitem> - Both the text of the current verse, and the verse number.
-</para>
-</listitem>
-<listitem>
-<para>
-<guimenuitem>Chapter</guimenuitem> - the entire chapter.
-</para>
-</listitem>
-<listitem>
-<para>
-<guimenuitem>Selected Text</guimenuitem> - Only the selected (highlighted) text.
-</para>
-</listitem>
-</itemizedlist>
-<para>
-This text can be copied into any application that can access the linux copy buffer.
-</para>
-</section>
-
-<section id="hdbk-op-print"><title>Add to Printing Queue</title>
-<important>
-<para>
-Selecting print here puts your print output in the bibletime print buffer.  
-Inorder to send your job to the printer (lpr) via kprinter, you must
-select <guimenu>file</guimenu> <guimenuitem>print</guimenuitem> on the
-<guilabel>menubar</guilabel>.
-</para>
-</important>
-<para>A mouse click here will bring up a submenu with the printing options:
-</para>
-<itemizedlist>
-<listitem>
-<para>
-<guimenuitem>reference with text</guimenuitem>
-</para>
-</listitem>
-<listitem>
-<para>
-<guimenuitem>chapter</guimenuitem>
-</para>
-</listitem>
-</itemizedlist>
-<para>
-Selecting these places text into the bibletime print queue, but it
-will not print yet.  When all of the items that you desire to print are
-copied to the print queue, select the print icon and the print dialog
-window is displayed.  Now you can select to either view or print the text.
-</para>
-<para>Printing from &bibletime; is rather basic and is intended as
-a utility.  If you are composing a document or presentation containing text from
-&bibletime; documents, we suggest that you use one of the presentation or editing
-tools on your system to format your work.
-</para>
-</section>
-<section id="hdbk-op-save">
-<title>Save</title>
-<para>A mouse click here will bring up a submenu with save options:
-</para>
-<itemizedlist>
-<listitem>
-<para>
-<guimenuitem>Verse with reference</guimenuitem> - a file is created in &UNIX; formated ASCII text.
-</para>
-</listitem>
-<listitem>
-<para>
-<guimenuitem>Chapter as plain text</guimenuitem> - a file is created in &UNIX; formated ASCII text.
-</para>
-</listitem>
-<listitem>
-<para>
-<guimenuitem>Chapter as HTML</guimenuitem> - a file is created formated in HTML.
-</para>
-</listitem>
-</itemizedlist>
-<para>
-Once saved this text can be opened and edited by any text or HTML application.
-</para>
-</section>
-</section>
-
-</chapter>
-
-
-
-
diff --git a/docs/handbook/unicode/hdbk-start.docbook b/docs/handbook/unicode/hdbk-start.docbook
deleted file mode 100644
index 0324b2f..0000000
--- a/docs/handbook/unicode/hdbk-start.docbook
+++ /dev/null
@@ -1,122 +0,0 @@
-<chapter id="hdbk-term"><title>Starting &bibletime;</title>
-
-<para>
-&bibletime; is a &kde; program and is integrated with the &kde; desktop.
-You can launch &bibletime; from the &kde; <guimenu>start menu</guimenu> in
-the applications group.
-
-<mediaobject>
-<imageobject>
-<imagedata fileref="hi32-app-bibletime.png" format="PNG"/>
-</imageobject>
-<textobject>
-<phrase>Icon used to start &bibletime;</phrase> </textobject>
-</mediaobject>
-
-</para>
-
-<para>
-&bibletime; can also be launched from a terminal command prompt.
-To launch &bibletime; open a terminal (any Xterminal inside a &kde;3 session) and type
-<command>bibletime</command>.
-</para>
-
-<section id="hdbk-start-otherwm"><title>Other Window Managers (not &kde;)</title>
-
-<para>
-&bibletime; can be launched from inside other window managers
-(like gnome) providing &kde; is installed.  You will need to install
-your own icon to launch the program.  See the window manager help
-files to see how.
-</para>
-
-<para>
-&bibletime; can be used with other window managers such as Gnome, BlackBox, Sawfish, providing
-&kde;3 is already installed on your computer.  If you installed &kde;3 using the
-&Linux-Mandrake; 8.x RPM's from a terminal using the mandrake RPM's KDE3 is installed
-in /opt, so the start up command in a terminal is:</para>
-<screen>
-export KDEDIR=/opt/kde3
-bibletime
-</screen>
-<para>
-&bibletime; will now open inside of a window of the current window manager.
-If you do not have &kde;3 installed in your copy of &Linux;, you should have tried the
-<ulink url="http://gnomesword.sourceforge.net/">Gnomesword application.</ulink>, or one 
-of the &kde;2 versions of &bibletime;.
-</para>
-<para>With &Linux-Mandrake; 9.0 and other other distributions where &kde; 3.x is
-installed in the normal location, simply type:</para>
-<screen>
-bibletime
-</screen>
-in any terminal to launch &bibletime;.
-</section>
-<section id="hdbk-start-custom"><title>Startup Customization</title>
-
-<para>
-From a terminal you can use &bibletime; to open a random verse in the default bible:</para>
-<para><command>
-bibletime --open-default-bible "&lt;random&gt;"
-</command></para>
-
-<para>
-To open at a given passage use:</para><para>
-<command>
-bibletime --open-default-bible "John 3:16"
-</command></para>
-
-
-<para>
-You can also use keys in your current bookname language.
-</para></section>
-
-
-<section id="hdbk-start-sequence"><title>Startup Sequence</title>
-<para>
-As &bibletime; launches you may see some message screens:</para>
-<itemizedlist>
-<listitem>
-<para>
-<interface>No Modules Installed</interface> - This is shown if you
-have forgotten to install sword modules, or if the sword modules
-can not be found.
-</para>
-</listitem>
-<listitem>
-<para>
-<interface>First Time Startup</interface> - This is shown the first time
-&bibletime; is launched.
-</para>
-</listitem>
-<listitem>
-<para>
-<interface>Daily Tips</interface> - These show on every startup, unless
-you turn them off.
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-start-sequence-tips.png" format="PNG"/>
-</imageobject>
-<textobject>
-<phrase>Daily tips</phrase> </textobject>
-</mediaobject>
-</para>
-</listitem>
-</itemizedlist>
-
-</section>
-<section id="hdbk-start-screen"><title>Parts of the &bibletime; Window</title>
-<para>
-Now the main &bibletime; window will open.  It's operation is covered in the next chapter.
-<mediaobject>
-<imageobject>
-<imagedata fileref="hdbk-start-screen-terms.png" format="PNG"/>
-</imageobject>
-<textobject>
-<phrase>The &bibletime; Application Window</phrase> </textobject>
-</mediaobject>
-</para>
-</section>
-</chapter>
-
-
diff --git a/docs/handbook/unicode/hdbk-toolbars.docbook b/docs/handbook/unicode/hdbk-toolbars.docbook
deleted file mode 100644
index 9ac0c50..0000000
--- a/docs/handbook/unicode/hdbk-toolbars.docbook
+++ /dev/null
@@ -1,734 +0,0 @@
-<chapter id="hdbk-bars"><title>Main toolbar and menubar</title>
-<para></para>
-
-
-	<section id="hdbk-bars-toolbar"><title>Toolbar</title>
-
-	<para> The action of each button is described in the configuration dialog box.
-	<action>Moving the cursor over a button</action> will activate the button's tooltip which
-	describes that buttons action.
-	</para>
-	</section>
-	<section id="hdbk-bars-toolbar-action"><title>Button Action</title>
-	<para>
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./view_sidetree.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>view_sidetree.png</phrase>
-	</textobject>
-	<caption>
-	<para>In the <guilabel>Preferences Dialog</guilabel>, this icon opens the
-	<guilabel>Manage sessions</guilabel> dialog.  Here you can save a display for later recall.
-	</para>
-	</caption>
-	</mediaobject>
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./key_bindings.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>key_bindings.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Preferences Dialog</guilabel>, this icon opens the
-	<guilabel>Accelerator</guilabel> dialog.  Here you can customize the key bindings 
-	(keyboard shortcuts).
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./kcmfontinst.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>kcmfontinst.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Preferences Dialog</guilabel>, this icon opens the
-	<guilabel>Choose Fonts</guilabel> dialog.  Here you select the font used to display your sword modules.
-	</para>
-	</caption>
-	</mediaobject>
-
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./window_fullscreen.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>window_fullscreen.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon expands &bibletime;
-	to use the entire viewing area of your monitor.
-	</para>
-	</caption>
-	</mediaobject>
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./ktip.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>ktip.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon opens the <guilabel>Daily Tip</guilabel>.
-	</para>
-	</caption>
-	</mediaobject>
-
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./configure.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>configure.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon opens the
-	<guilabel>Configure &bibletime;</guilabel> dialog.
-<!--	In the <guilabel>Tool Bar</guilabel> this icon opens the
-	<guilabel>Configure Toolbars</guilabel> dialog.
-	In the <guilabel>Tool Bar</guilabel> this icon opens the
-	<guilabel>Report A Bug</guilabel> dialog.
--->
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./contents.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>contents.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon opens the
-	Handbook.
-<!--	In the <guilabel>Tool Bar</guilabel> this icon opens the
-	Biblestudy HowTo.
--->
-	</para>
-	</caption>
-	</mediaobject>
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./exit.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>exit.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon closes &bibletime;.
-	</para>
-	</caption>
-	</mediaobject>
-		
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./fileclose.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>fileclose.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon closes all open
-	<guilabel>Document Windows</guilabel>.
-	</para>
-	</caption>
-	</mediaobject>
-		
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./fileprint.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>fileprint.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon opens the
-	<guilabel>Print</guilabel> dialog.  Right clicking in an <guilabel>Active Document Window</guilabel>
-	and this symbol in a drop down menu sends the selected text to the print queue.
-	</para>
-	</caption>
-	</mediaobject>
-		
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./find.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>find.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Main Index</guilabel> or the <guilabel>Tool Bar</guilabel>
-	this icon opens the <guilabel>Search Dialog</guilabel>.
-	</para>
-	</caption>
-	</mediaobject>
-	
-<!--	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./start.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>start.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon resets the 
-	<guilabel>Main Index</guilabel> to display just the default groups.  
-	Be Careful, it also will delete all of your bookmarks.
-	</para>
-	</caption>
-	</mediaobject>
--->
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_bible_add.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>bible_add.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Document Control Menu</guilabel> this icon opens the drop down menu that
-	allows selection of an additional Bible Text.
-	</para>
-	</caption>
-	</mediaobject>
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_bible.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>bible.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>main index</guilabel> this icon opens a Sword book module.  
-	This is used for modules that are not commentaries, lexicons or Bible texts.
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_book_add.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>book_add.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Document Control Menu</guilabel> this icon opens the drop down menu that
-	allows selection of an additional Sword book module. This is used for modules that are not 
-	commentaries, lexicons or Bible texts.
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_book.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>book.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>main index</guilabel> this icon opens a Bible Text.
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_cascade_auto.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>cascade_auto.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon automatically cascades
-	displayed books as they are opened.
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_cascade.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>cascade.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon cascades the displayed books now.
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_commentary_add.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>commentary_add.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Document Control Menu</guilabel> this icon opens the drop down menu that
-	allows selection of an additional Lexicon.
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_commentary.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>commentary.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>main index</guilabel> this icon opens a lexicon.
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_displayconfig.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>displayconfig.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Preferences Dialog</guilabel>, this icon opens the <guilabel>Colors Dialog</guilabel>.
-	Here you can change the colors of the displayed text..
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_lexicon_add.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>lexicon_add.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Document Control Menu</guilabel> this icon opens the drop down menu that
-	allows selection of an additional Lexicon.
-	</para>
-	</caption>
-	</mediaobject>
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_lexicon.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>lexicon.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>main index</guilabel> this icon opens a lexicon.
-	</para>
-	</caption>
-	</mediaobject>
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_startconfig.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>startconfig.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Preferences Dialog</guilabel>, this icon opens the Startup Dialog.
-	Here you can turn on (off) the tip of the day and the startup logo.
-	</para>
-	</caption>
-	</mediaobject>
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_swordconfig.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>swordconfig.png</phrase>
-	</textobject><caption>
-	<para><guimenuitem>Configure Sword</guimenuitem>. This icon is used in the
-	<guilabel>Preferences Dialog</guilabel>. Here you can configure features controlled by
-	the sword backend. Like default books, language used for book names, and various 
-	text display features.
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_sync.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>sync.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon links a commentary to 
-	the current open Bible. Thereafter the Commentary and the Bible scroll together.
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_tile_auto.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>tile_auto.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon automatically tiles
-	displayed books as they are opened.
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-action-bt_tile.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>tile.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon tiles the displayed books now.
-	</para>
-	</caption>
-	</mediaobject>
-	
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./hi32-app-bibletime.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>bibletime.png</phrase>
-	</textobject><caption>
-	<para>This icon is used with the desktop shortcut that launches &bibletime;.
-	In the <guilabel>Tool Bar</guilabel> this icon displays the &bibletime; version
-	information, license, and other interesting information.
-	</para>
-	</caption>
-	</mediaobject>
-
-
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./go.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>go.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon displays the &kde; version
-	information, license, and other interesting information.
-	</para>
-	</caption>
-	</mediaobject>
-
-
-
-<!--	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./editdelete.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>editdelete.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon will remove the previously
-	selected item in the <guilabel>Main Index</guilabel>.
-	</para>
-	</caption>
-	</mediaobject>
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./pencil.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>pencil.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Personal Commentary</guilabel>
-	this icon will start the editor for the personal commentary.
-	</para>
-	</caption>
-	</mediaobject>
--->	
-
-	<mediaobject>
-	<imageobject>
-	<imagedata fileref="./queue.png" format="PNG"/>
-	</imageobject>
-	<textobject>
-	<phrase>queue.png</phrase>
-	</textobject><caption>
-	<para>In the <guilabel>Tool Bar</guilabel> this icon will clear the print queue.
-	</para>
-	</caption>
-	</mediaobject>
-
-	</para>
-	</section>
-
-
-	<section id="hdbk-bars-menubar"><title>Menubar</title>
-	<para>Various features of bibletime are accessed by way of 
-	drop down menus from the menubar.</para>
-	
-
-	<section id="hdbk-bars-menubar-file"><title>File</title>
-	<para>
-
-	<variablelist>
-	<varlistentry>
-	<term>Clear printing queue</term>
-	<listitem>
-	<para>Clears all items from the &bibletime; print queue.
-	The &bibletime; printing queue does not clear automatically.</para>
-	</listitem>
-	</varlistentry>
-	<varlistentry>
-	<term>
-	Print</term>
-	<listitem>
-	<para>This menu item launches the <guilabel>printdialog</guilabel> box.
-	From here you will select print or view as for any other &kde; application.</para>
-	</listitem>
-	</varlistentry>
-	<varlistentry>
-	<term>
-	Quit</term>
-	<listitem>
-	<para>Closes &bibletime;.</para>
-	</listitem>
-	</varlistentry>
-	</variablelist>
-	</para>
-	</section>
-
-	<section id="hdbk-bars-menubar-view"><title>View</title>
-	<para>
-
-	<variablelist>
-	<varlistentry>
-	<term>Show Toolbar</term>
-	<listitem>
-	<para>If <guimenuitem>show toolbar</guimenuitem> is selected,
-	the toolbar is displayed.
-	If <guimenuitem>show toolbar</guimenuitem> is unselected then the
-	toolbar is hidden.</para>
-	</listitem>
-	</varlistentry>
-
-	<varlistentry>
-	<term>
-	Show Main Index</term>
-	<listitem>
-	<para>If <guimenuitem>show main index</guimenuitem> is selected,
-	the left pane showing the available &sword; documents is displayed.
-	If <guimenuitem>show main index</guimenuitem> is unselected then the
-	left pane is hidden.</para>
-	</listitem>
-	</varlistentry>
-	</variablelist>
-	</para>
-	</section>
-
-	<section id="hdbk-bars-menubar-mainindex"><title>Search</title>
-	<para>
-
-	<variablelist>
-	<varlistentry><term>Search in default Bible</term>
-	<listitem>
-	<para>
-	If <guimenuitem>Search in default Bible</guimenuitem> is selected,
-	<guilabel>search dialog</guilabel> is displayed with the default 
-	Bible selected as the search parameter.
-	</para>
-	</listitem>
-	</varlistentry>
-	<varlistentry><term>Search in open module(s)</term>
-	<listitem>
-	<para>
-	If <guimenuitem>Search in open module(s)</guimenuitem> is selected,
-	<guilabel>search dialog</guilabel> is displayed with all of the 
-	open modules selected as the search parameters.
-	</para>
-	</listitem>
-	</varlistentry>
-	</variablelist>
-
-	</para>
-	</section>
-
-	<section id="hdbk-bars-menubar-Window"><title>Window</title>
-	<para>
-	<variablelist>
-
-	<varlistentry>
-	<term>Save session</term>
-	<listitem><para>Saves the current configuration to
-	a selected Session.</para></listitem>
-	</varlistentry>
-
-	<varlistentry>
-	<term>Save as new session</term>
-	<listitem><para>Saves the current configuration to
-	a session, and allows the new session to be named.</para></listitem>
-	</varlistentry>
-
-	<varlistentry>
-	<term>Load session</term>
-	<listitem><para>Loads the contents of the named session to
-	the current session of &bibletime;.</para></listitem>
-	</varlistentry>
-
-	<varlistentry>
-	<term>Configure sessions</term>
-	<listitem><para>This brings up the <guilabel>Sessions</guilabel> tab of the
-	<guilabel>Preferences Dialog</guilabel>.
-	Here you create and manage Sessions.</para></listitem>
-	</varlistentry>
-
-
-	<varlistentry>
-	<term>Fullscreen Mode</term>
-	<listitem><para>When <guimenuitem>Fullscreen Mode</guimenuitem> is selected, &bibletime; will expand
-	to the full size of your monitor screen.  To reverse the action select
-	<guimenuitem>Fullscreen Mode</guimenuitem>again. </para></listitem>
-	</varlistentry>
-
-	<varlistentry>
-	<term>Cascade</term>
-	<listitem><para>Cascades open display windows.</para></listitem>
-	</varlistentry>
-
-	<varlistentry>
-	<term>Tile</term>
-	<listitem>
-	<para>Tiles open display windows.</para>
-	</listitem>
-	</varlistentry>
-
-	<varlistentry>
-	<term>Auto Cascade</term>
-	<listitem>
-	<para>Automatically cascades newly opened display windows.</para>
-	</listitem>
-	</varlistentry>
-
-	<varlistentry>
-	<term>Auto Tile</term>
-	<listitem>
-	<para>Ditto for tiling newly opened display windows.</para>
-	</listitem>
-	</varlistentry>
-
-	<varlistentry>
-	<term>Close all</term>
-	<listitem>
-	<para>Closes all open display windows.</para>
-	</listitem>
-	</varlistentry>
-
-	<varlistentry>
-	<term>List of open modules</term>
-	<listitem>
-	<para>Shows a list of all of the currently open modules.  
-	Selecting a module in this list makes that open module the 
-	selected module in the display area.</para>
-	</listitem>
-	</varlistentry>
-
-	</variablelist>
-	</para>
-	</section>
-
-	<section id="hdbk-bars-menubar-settings"><title>Settings</title>
-	<para>
-
-	<variablelist>
-
-	<varlistentry>
-	<term>Configure Toolbar</term>
-	<listitem>
-	<para>Show the <guilabel>Configure Toolbar</guilabel> dialog.</para>
-	</listitem>
-	</varlistentry>
-
-	<varlistentry>
-	<term>Configure &bibletime;</term>
-	<listitem>
-	<para>Shows the <guilabel>Preferences Dialog</guilabel>.
-	From this dialog the startup mode, fonts, colors, sessions,
-	sword features, and accelerators are configurable. </para>
-	</listitem>
-	</varlistentry>
-	</variablelist>
-
-	</para>
-	</section>
-
-<section id="hdbk-bars-menubar-Help"><title>Help</title>
-<para>
-
-<variablelist>
-
-<varlistentry>
-<term>Handbook</term>
-<listitem><para>Select <guimenuitem>Handbook</guimenuitem> to access
-this document from the &kde; Help Center.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Biblestudy HowTo</term>
-<listitem><para>Select <guimenuitem>Biblestudy HowTo</guimenuitem> to access
-a good basic text with recommendations for studying the Bible.
-</para></listitem>
-</varlistentry>
-
-<varlistentry>
-<term>What's This</term>
-<listitem>
-<para>
-Allows you to click on certain items for contextual help.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Bug Report</term>
-<listitem>
-<para>
-Send a bug report to the program's maintainers to help development.
-Before sending a bug report please configure the bug report application
-to use your mail program.  This is done by <guibutton>configure</guibutton>
-on the <guilabel>Submit A Bug Report</guilabel> dialog.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Daily Tip</term>
-<listitem>
-<para>Launches the <guilabel>tip of the day</guilabel> dialog.</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>About &bibletime;</term>
-<listitem>
-<para>
-Opens a window with general &bibletime; information.
-</para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>About &kde;</term>
-<listitem>
-<para>
-Opens a window with general &kde; information.
-</para>
-</listitem>
-
-</varlistentry>
-
-</variablelist>
-
-</para>
-</section>
-</section>
-</chapter>
-
diff --git a/docs/handbook/unicode/index.docbook b/docs/handbook/unicode/index.docbook
deleted file mode 100644
index fbbd5db..0000000
--- a/docs/handbook/unicode/index.docbook
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-  <!ENTITY bibletime '<application>BibleTime</application>'>
-  <!ENTITY sword '<application>Sword</application>'>
-  <!ENTITY % addindex "IGNORE">
-  <!ENTITY % English "INCLUDE"><!-- change language only here -->
-
-  <!-- user entities -->
-  <!ENTITY hdbkchap1 SYSTEM "hdbk-intro.docbook">
-  <!ENTITY hdbkchap2 SYSTEM "hdbk-start.docbook">
-  <!ENTITY hdbkchap3 SYSTEM "hdbk-operation.docbook">
-  <!ENTITY hdbkchap4 SYSTEM "hdbk-config.docbook">
-  <!ENTITY hdbkchap5 SYSTEM "hdbk-toolbars.docbook">
-
-]>
-
-
-<book lang="&language;">
-
-<bookinfo>
-<title>The &bibletime; Handbook</title>
-
-<authorgroup>
-
-<author>
-<firstname>Fred</firstname>
-<surname>Saalbach</surname>
-<affiliation>
-<address><email>info@bibletime.info</email></address>
-</affiliation>
-</author>
-
-<author>
-<firstname>Jeffrey</firstname>
-<surname>Hoyt</surname>
-</author>
-
-</authorgroup>
-
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-
-<copyright>
-<year>1999</year>
-<year>2000</year>
-<year>2001</year>
-<year>2002</year>
-<year>2003</year>
-<holder>The team of &bibletime;, info@bibletime.info</holder>
-</copyright>
-
-<legalnotice>
-
-<para>The &bibletime; handbook is part of &bibletime;.
-</para>
-
-<para>
-&bibletime; 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.
-</para>
-
-<para>
-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.
-</para>
-
-<para>
-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.
-</para></legalnotice>
-
-<date>13/February/2002</date>
-<releaseinfo>1.3</releaseinfo>
-
-<abstract>
-<para>
-&bibletime; is an application to aid in study of the Bible.
-
-</para>
-</abstract>
-
-<keywordset>
-<keyword>KDE</keyword>
-<keyword>bibletime</keyword>
-<keyword>&bibletime;</keyword>
-<keyword>sword</keyword>
-<keyword>crosswire</keyword>
-<keyword>help dialog</keyword>
-</keywordset>
-
-</bookinfo>
-
-&hdbkchap1;
-&hdbkchap2;
-&hdbkchap3;
-&hdbkchap4;
-&hdbkchap5;
-
-</book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->
diff --git a/docs/howto/Makefile.am b/docs/howto/Makefile.am
deleted file mode 100644
index 7e4ac2a..0000000
--- a/docs/howto/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-SUBDIRS = unicode html
-html-files:
-	if test -e unicode/index.docbook; then \
-		olddir=$$PWD; \
-		cd html;\
-		echo "Validating the XML files..."; \
-		if meinproc ../unicode/index.docbook; then\
-			echo "HTML files created successfully."; \
-		fi; cd $$olddir; \
-	fi;
-
diff --git a/docs/howto/Makefile.in b/docs/howto/Makefile.in
deleted file mode 100644
index a645d6d..0000000
--- a/docs/howto/Makefile.in
+++ /dev/null
@@ -1,657 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-SUBDIRS = unicode html
-subdir = docs/howto
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-
-#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
-#>- 	all-recursive install-data-recursive install-exec-recursive \
-#>- 	installdirs-recursive install-recursive uninstall-recursive \
-#>- 	check-recursive installcheck-recursive
-#>+ 5
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
-DIST_COMMON = Makefile.am Makefile.in
-DIST_SUBDIRS = $(SUBDIRS)
-#>- all: all-recursive
-#>+ 1
-all: docs-am  all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/howto/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/howto/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/howto/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-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.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (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.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	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; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	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
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
-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-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; \
-	else \
-	  include_option=--include; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	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)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
-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 GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$(top_distdir)" \
-	        distdir=../$(distdir)/$$subdir \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-recursive
-#>+ 1
-clean: kde-rpo-clean  clean-recursive
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-
-distclean-am: clean-am distclean-generic distclean-libtool \
-	distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-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
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-libtool clean-recursive ctags \
-	ctags-recursive distclean distclean-generic distclean-libtool \
-	distclean-recursive distclean-tags distdir dvi dvi-am \
-	dvi-recursive info info-am info-recursive install install-am \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
-	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-info-recursive uninstall-recursive
-
-html-files:
-	if test -e unicode/index.docbook; then \
-		olddir=$$PWD; \
-		cd html;\
-		echo "Validating the XML files..."; \
-		if meinproc ../unicode/index.docbook; then\
-			echo "HTML files created successfully."; \
-		fi; cd $$olddir; \
-	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:
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/howto/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/howto/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-recursive
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/docs/howto/html/Makefile.am b/docs/howto/html/Makefile.am
deleted file mode 100644
index f5e17f6..0000000
--- a/docs/howto/html/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = 
-
diff --git a/docs/howto/html/Makefile.in b/docs/howto/html/Makefile.in
deleted file mode 100644
index 47fa742..0000000
--- a/docs/howto/html/Makefile.in
+++ /dev/null
@@ -1,498 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = 
-subdir = docs/howto/html
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/howto/html/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/howto/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/howto/html/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-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:
-
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-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
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-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.
-.NOEXPORT:
-
-#>+ 2
-KDE_DIST=h2-importance.html h2-importance-wars.html h2-importance-exhortations.html h2-importance-once.html h2-importance-breathed.html h2-rules-parables.html h2-importance-liberates.html h2-rules.html h2-basics-types.html h2-importance-supplement.html h2-basics-approaches.html index.html h2-rules-context.html h2-rules-hcontest.html h2-importance-works.html h2-basics-expository.html h2-basics.html h2-basics-interpretation.html h2-basics-worksheet.html h2-rules-normal.html 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/howto/html/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/howto/html/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/docs/howto/html/h2-basics-approaches.html b/docs/howto/html/h2-basics-approaches.html
deleted file mode 100644
index 274e6d2..0000000
--- a/docs/howto/html/h2-basics-approaches.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html><head><title>Approaches to God's Word</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-basics.html" title="Chapter 2. Bible Study Basics"><link rel="previous" href="h2-basics.html" title="Chapter 2. Bible Study Basics"><link rel="next" href="h2-basics-types.html" title="Types of Bible Studies"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Approaches to God's Word</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-basics.html">Prev</a></td><td align="center" class="center">Bible Study Basics</td><td align="right" class="right"><a accesskey="n" href="h2-basics-types.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-basics-approaches"></a>Approaches to God's Word</h2></div></div><p>Hearing and reading provide a telescopic view of the scripture while study
-and memorization provide a microscopic view of scripture.  Meditating on the
-scriptures brings hearing, reading, studying and memorization together and
-cements the word in our minds.</p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-approaches-hear"></a>Hear </h3></div></div><p>Lk.11:28 <span class="emphasis"><i>&quot;blessed are those who hear the word of God, and
-observe it.&quot;</i></span></p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-approaches-read"></a>Read  </h3></div></div><p>Rev.1:3
-<span class="emphasis"><i>&quot;Blessed is he who reads and those who hear the words of this
-prophecy...&quot;</i></span></p><p>1 Tim.4:13 <span class="emphasis"><i>&quot;give
-attention to the public reading of Scripture...&quot;</i></span></p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-approaches-study"></a>Study </h3></div></div><p>Acts 17:11 <span class="emphasis"><i>&quot;Now these were more noble-minded than those in
-Thessalonica, for they received the word with great eagerness, examining the
-Scriptures daily, to see whether these things were so.&quot;</i></span></p><p>2 Tim.2:15 <span class="emphasis"><i>&quot;Be diligent [KJV `Study'] to present yourself
-approved to God as a workman who does not need to be ashamed, handling
-accurately the word of truth.&quot;</i></span></p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-approaches-memorize"></a>Memorize </h3></div></div><p>Ps.119:11 <span class="emphasis"><i>&quot;Thy word I have hid in my heart, that I may not
-sin against Thee.&quot;</i></span></p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-approaches-meditate"></a>Meditate</h3></div></div><p>Ps.1:2-3 <span class="emphasis"><i>&quot;But his delight is in the law of the Lord, And
-in His law he meditates day and night. And he will be like a tree firmly planted
-by streams of water, Which yields its fruit in its season, And its leaf does not
-wither; And in whatever he does, he prospers.&quot;</i></span></p><p>The Navigators illustrate this by saying that as the thumb can touch all
-the fingers, we can meditate on the Word as we do any of the first four.
-Meditation is a key to revelation. A new Christian needs to hear and read the
-Bible more than they need to study and memorize it. This is so that they become
-familiar with the overall message of the Bible. </p></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-basics.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-basics-types.html">Next</a></td></tr><tr><td width="33%" align="left">Bible Study Basics </td><td width="34%" align="center"><a href="h2-basics.html">Up</a></td><td width="33%" align="right"> Types of Bible Studies</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-basics-expository.html b/docs/howto/html/h2-basics-expository.html
deleted file mode 100644
index 0ad2bac..0000000
--- a/docs/howto/html/h2-basics-expository.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html><head><title>An Expository Study
-of Matthew 6:1-18</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-basics.html" title="Chapter 2. Bible Study Basics"><link rel="previous" href="h2-basics-interpretation.html" title="Basics of Correct Interpretation"><link rel="next" href="h2-basics-worksheet.html" title="Worksheet: How to Use a Concordance"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>An Expository Study
-of Matthew 6:1-18</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-basics-interpretation.html">Prev</a></td><td align="center" class="center">Bible Study Basics</td><td align="right" class="right"><a accesskey="n" href="h2-basics-worksheet.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-basics-expository"></a>An Expository Study
-of Matthew 6:1-18</h2></div></div><p>Let's study together Mt.6:1-18.  Read it to yourself, first looking for the key verse, the verse that sums
-up the whole passage.  Think you have it?  Test it by picking different places in the passage and asking yourself
-if they relate to the thought of the key verse.  Once you find it, write it as Roman numeral One of your outline:</p><pre class="screen">
-I. BEWARE OF PRACTICING YOUR RIGHTEOUSNESS BEFORE MEN TO BE NOTICED
-</pre><p>What does &quot;practicing your righteousness&quot; mean?  Does the passage give any examples?  What area
-of our lives is being addressed?    our motives!      What sub-headings develop this thought?</p><pre class="screen">
-  A. WHEN YOU GIVE
-  B. WHEN YOU FAST
-  C. WHEN YOU PRAY
-</pre><p>Now fill in the outline with specific instructions of how to avoid wrong ways of practicing our
-righteousness:</p><pre class="screen">
-  A. When you give
-     1. DON'T SOUND A TRUMPET.  (HOW MIGHT SOMEONE &quot;SOUND A TRUMPET&quot; TODAY?)
-     2. DO IT SECRETLY.	ETC.
-</pre></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-basics-interpretation.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-basics-worksheet.html">Next</a></td></tr><tr><td width="33%" align="left">Basics of Correct Interpretation </td><td width="34%" align="center"><a href="h2-basics.html">Up</a></td><td width="33%" align="right"> Worksheet: How to Use a Concordance</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-basics-interpretation.html b/docs/howto/html/h2-basics-interpretation.html
deleted file mode 100644
index 52a41af..0000000
--- a/docs/howto/html/h2-basics-interpretation.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><head><title>Basics of Correct Interpretation</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-basics.html" title="Chapter 2. Bible Study Basics"><link rel="previous" href="h2-basics-types.html" title="Types of Bible Studies"><link rel="next" href="h2-basics-expository.html" title="An Expository Study
-of Matthew 6:1-18"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Basics of Correct Interpretation</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-basics-types.html">Prev</a></td><td align="center" class="center">Bible Study Basics</td><td align="right" class="right"><a accesskey="n" href="h2-basics-expository.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-basics-interpretation"></a>Basics of Correct Interpretation</h2></div></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-interpretation-content"></a>Content</h3></div></div><p>What does it say?  What does it say in the original language?  Be careful
-with definitions. Don't read into it what it doesn't say.</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-interpretation-context"></a>Context</h3></div></div><p>What do the verses around it say?  &quot;Context is king&quot; is the rule -- the passage must make
-sense within the structure of the entire passage and book.</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-interpretation-cross"></a>Cross-reference</h3></div></div><p> What do other verses about this subject say through the rest of the Bible?  God
-doesn't contradict Himself, so our interpretation needs to stand the test of other scriptures.</p></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-basics-types.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-basics-expository.html">Next</a></td></tr><tr><td width="33%" align="left">Types of Bible Studies </td><td width="34%" align="center"><a href="h2-basics.html">Up</a></td><td width="33%" align="right"> An Expository Study
-of Matthew 6:1-18</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-basics-types.html b/docs/howto/html/h2-basics-types.html
deleted file mode 100644
index e5ee5e9..0000000
--- a/docs/howto/html/h2-basics-types.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><head><title>Types of Bible Studies</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-basics.html" title="Chapter 2. Bible Study Basics"><link rel="previous" href="h2-basics-approaches.html" title="Approaches to God's Word"><link rel="next" href="h2-basics-interpretation.html" title="Basics of Correct Interpretation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Types of Bible Studies</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-basics-approaches.html">Prev</a></td><td align="center" class="center">Bible Study Basics</td><td align="right" class="right"><a accesskey="n" href="h2-basics-interpretation.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-basics-types"></a>Types of Bible Studies</h2></div></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="basics-types-topical"></a>Topical Study</h3></div></div><p>Pick out a certain
-topic and follow it through, using cross-references or a
-concordance.</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-types-character"></a>Character Study</h3></div></div><p>Studying the life of a Bible character, e.g. Joseph's life in
-Gen.37-50.</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="basics-types-expository"></a>Expository Study</h3></div></div><p>Studying a
-certain passage:  paragraph, chapter, or book.</p></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-basics-approaches.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-basics-interpretation.html">Next</a></td></tr><tr><td width="33%" align="left">Approaches to God's Word </td><td width="34%" align="center"><a href="h2-basics.html">Up</a></td><td width="33%" align="right"> Basics of Correct Interpretation</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-basics-worksheet.html b/docs/howto/html/h2-basics-worksheet.html
deleted file mode 100644
index 164fe54..0000000
--- a/docs/howto/html/h2-basics-worksheet.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html><head><title>Worksheet: How to Use a Concordance</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-basics.html" title="Chapter 2. Bible Study Basics"><link rel="previous" href="h2-basics-expository.html" title="An Expository Study
-of Matthew 6:1-18"><link rel="next" href="h2-rules.html" title="Chapter 3. Rules of Bible Interpretation (Hermeneutics)"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Worksheet: How to Use a Concordance</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-basics-expository.html">Prev</a></td><td align="center" class="center">Bible Study Basics</td><td align="right" class="right"><a accesskey="n" href="h2-rules.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-basics-worksheet"></a>Worksheet: How to Use a Concordance</h2></div></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-worksheet-select"></a>To Find a Particular Verse</h3></div></div><div class="orderedlist"><ol type="1"><li><p>Pick out a key word or most-unusual word of the verse.</p></li><li><p>Turn to this word alphabetically.</p></li><li><p>Go down the column of listings until you find your verse.</p></li></ol></div><pre class="screen">
-	Find these verses:
-		&quot;Faithful are the wounds of a friend.&quot;
-		&quot;We are ambassadors of Christ.&quot;
-		The story of the rich man and Lazarus.
-</pre></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-worksheet-study"></a>To Do a Topical Study </h3></div></div><p>Let's say you wanted to do a study of the word &quot;redemption.&quot;  First you would look up that word in the
-concordance and look up references listed for it.  Then you could look up related words and references listed for them, e.g.
-&quot;redeem, redeemed, ransom,&quot; even &quot;buy&quot; or &quot;bought.&quot; </p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-worksheet-clarify"></a>To Clarify Word Meanings in the Greek and Hebrew</h3></div></div><p>What if you noticed a contradiction in the KJV between Mt.7:1 &quot;Judge not lest you be judged&quot; and 1 Cor.2:15
-&quot;He that is spiritual judgeth all things.&quot;  Maybe there are two different Greek words here, both being translated &quot;judge&quot; in
-English?  (We're using Strong's from here out.) </p><div class="orderedlist"><ol type="1"><li><p>Look up &quot;judge.&quot;</p></li><li><p>Go down the column of entries to Mt.7:1.  To the right is a number, 2919.  This refers to the Greek word used.
- Write it down.</p></li><li><p>Now look up &quot;judgeth.&quot;</p></li><li><p>Go down the column to 1 Cor.2:15 . . . . . 350.</p></li><li><p>Turn in the back to the Greek dictionary.  (Remember, you're in the NT so the language is Greek, while the
-OT is Hebrew.)  Compare the meaning of 2919 with the meaning of 350 and you have your answer! </p></li></ol></div></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-basics-worksheet-names"></a>To Find Meanings of Names</h3></div></div><p>By the same process we can find the meaning of a name in the Greek or Hebrew.</p><p>Look up these names and write down their meaning:</p><div class="itemizedlist"><ul type="disc"><li><p>Nabal </p></li><li><p>Abigail </p></li><li><p>Joshua  </p></li><li><p>Barnabus</p></li></ul></div></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-basics-expository.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-rules.html">Next</a></td></tr><tr><td width="33%" align="left">An Expository Study
-of Matthew 6:1-18 </td><td width="34%" align="center"><a href="h2-basics.html">Up</a></td><td width="33%" align="right"> Rules of Bible Interpretation (Hermeneutics)</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-basics.html b/docs/howto/html/h2-basics.html
deleted file mode 100644
index 542344f..0000000
--- a/docs/howto/html/h2-basics.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<html><head><title>Chapter 2. Bible Study Basics</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="index.html" title="The Biblestudy HowTo"><link rel="previous" href="h2-importance-supplement.html" title="Supplement: Bible Reading
-Programs"><link rel="next" href="h2-basics-approaches.html" title="Approaches to God's Word"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Bible Study Basics</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-importance-supplement.html">Prev</a></td><td align="center" class="center"> </td><td align="right" class="right"><a accesskey="n" href="h2-basics-approaches.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="h2-basics"></a>Chapter 2. Bible Study Basics</h2></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-basics-purpose"></a>Our Purpose as we Approach the Bible</h2></div></div><p>
-Jn.5:39-40<span class="emphasis"><i>&quot;You search the Scriptures, because you think that
-in them you have eternal life; and it is these that bear witness of Me; and you
-are unwilling to come to Me, that you may have life.&quot;</i></span>
-</p><p>The chief purpose of the book is to bring us to the Person.  Martin Luther
-said &quot;we go to the cradle only for the sake of the baby&quot;; just so
-in Bible study, we do it not for its own sake but for fellowship with God.
-</p><table border="0" width="100%" cellspacing="0" cellpadding="0" class="blockquote" summary="Block quote"><tr><td width="10%" valign="top"> </td><td width="80%" valign="top"><p>The Jews to whom Jesus spoke... imagined that to possess Scripture was
-tantamount to possessing life. Hillel used to say, &quot;He who has gotten to
-himself words of Torah has gotten to himself the life of the world to
-come.&quot;  Their study was an end in itself.  In this they were grievously
-deceived. ...</p><p>There is neither merit nor profit in the reading of
-Scripture for its own sake, but only if it effectively introduces us to Jesus
-Christ.  Whenever the Bible is read, what is needed is an eager expectation that
-through it we may meet Christ.</p></td><td width="10%" valign="top"> </td></tr><tr><td colspan="2" align="right" valign="top">--<span class="attribution">John R.W. Stott, <span class="emphasis"><i>Christ the
-Controversialist</i></span>, InterVarsity Press 1978, pp.97, 104.</span></td><td width="10%" valign="top"> </td></tr></table></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-importance-supplement.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-basics-approaches.html">Next</a></td></tr><tr><td width="33%" align="left">Supplement: Bible Reading
-Programs </td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right"> Approaches to God's Word</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-importance-breathed.html b/docs/howto/html/h2-importance-breathed.html
deleted file mode 100644
index de904b6..0000000
--- a/docs/howto/html/h2-importance-breathed.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html><head><title>A Book that God Breathed</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Importance of God's Word"><link rel="previous" href="h2-importance.html" title="Chapter 1. Importance of God's Word"><link rel="next" href="h2-importance-works.html" title="A Book that Works"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>A Book that God Breathed</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-importance.html">Prev</a></td><td align="center" class="center">Importance of God's Word</td><td align="right" class="right"><a accesskey="n" href="h2-importance-works.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-breathed"></a>A Book that God Breathed</h2></div></div><p><span class="emphasis"><i>Heb.4:12 </i></span>&quot;<span class="emphasis"><i>For the word of God is living and active...
-</i></span>&quot; Jesus said <span class="emphasis"><i>(Mt.4:4),</i></span>
-&quot;<span class="emphasis"><i>It is written, Man shall not live on bread alone, but on every word that
-proceeds [lit., is proceeding] from the mouth of God.</i></span>&quot;
-As we read the Bible, God's Spirit is there to speak it to our hearts in a continually-fresh way.
-</p><p>2 Tim.3:16 declares, &quot;<span class="emphasis"><i>All scripture is inspired by God [lit.,
-God-breathed].</i></span>&quot;  Do you believe this?  Before you answer, consider Jesus' attitude
-toward the Scriptures.  </p><table border="0" width="100%" cellspacing="0" cellpadding="0" class="blockquote" summary="Block quote"><tr><td width="10%" valign="top"> </td><td width="80%" valign="top"><p>He referred to the human authors, but took it for
-granted that behind them all was a single divine Author.  He could equally say
-'Moses said' or 'God said' (Mk.7:10). He could quote a comment of the narrator in
-Genesis 2:24 as an utterance of the Creator Himself (Mt.19:4-5).  Similarly He
-said, 'Well did Isaiah prophesy of you hypocrites, as it is written', when what He
-went on to quote is the direct speech of the Lord God (Mk.7:6 &amp; Is.29:13).  It
-is from Jesus Himself that the New Testament authors have gained their
-conviction of the dual authorship of Scripture.  For them it was just as true to
-say that 'God spoke of old to our fathers by the prophets' (Heb.1:1) as it was to
-say that 'men moved by the Holy Spirit spoke from God' (2 Pe.1:21).  God did not
-speak in such a way as to obliterate the personality of the human authors, nor
-did men speak in such a way as to corrupt the Word of the divine Author.  God
-spoke.  Men spoke.  Neither truth must be allowed to detract from the other. ...
-</p><p>
-This, then, was Christ's view of the Scriptures.  Their witness was God's
-witness. The testimony of the Bible is the testimony of God.  And the chief
-reason why the Christian believes in the divine origin of the Bible is that
-Jesus Christ Himself taught it.  </p></td><td width="10%" valign="top"> </td></tr><tr><td colspan="2" align="right" valign="top">--<span class="attribution">John R.W. Stott, <span class="emphasis"><i>Christ the Controversialist</i></span>,
-InterVarsity Press 1978, pp.93-95 </span></td><td width="10%" valign="top"> </td></tr></table><p>2 Tim.3:16 goes on, &quot;<span class="emphasis"><i>and profitable for teaching, for
-correction, for training in righteousness, that the man of God may be adequate,
-equipped for every good work.</i></span>&quot;  If we accept that the Bible really is God
-speaking to us, it follows that it will be our authority in all matters of faith
-and conduct. </p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-importance.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-importance-works.html">Next</a></td></tr><tr><td width="33%" align="left">Importance of God's Word </td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right"> A Book that Works</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-importance-exhortations.html b/docs/howto/html/h2-importance-exhortations.html
deleted file mode 100644
index ca071e9..0000000
--- a/docs/howto/html/h2-importance-exhortations.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html><head><title>Exhortations</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Importance of God's Word"><link rel="previous" href="h2-importance-wars.html" title="A Book that Wars"><link rel="next" href="h2-importance-once.html" title="Appendix: &quot;Once for
-All&quot;"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Exhortations</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-importance-wars.html">Prev</a></td><td align="center" class="center">Importance of God's Word</td><td align="right" class="right"><a accesskey="n" href="h2-importance-once.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-exhortations"></a>Exhortations</h2></div></div><p>
-2 Tim.2:15 (KJV) &quot;<span class="emphasis"><i>Study to show thyself approved unto God, a workman that needeth not to be ashamed, rightly
-dividing the word of truth.</i></span>&quot;
-</p><p>
-Col.3:16 &quot;<span class="emphasis"><i>Let the word of Christ richly dwell within you; with all wisdom teaching and admonishing one another
-with psalms and hymns and spiritual songs, singing with thankfulness in your hearts to God.</i></span>&quot;
-</p><p>If you're rich in something, how much of it do you
-have? </p><p>
-Not a little!</p><p>
-Eccl.12:11 &quot;<span class="emphasis"><i>The words of wise men are like goads, and masters of these
-collections are like well-driven nails; they are given by one Shepherd.  But
-beyond this, my son, be warned:  the writing of many books is endless, and
-excessive devotion to books is wearying to the body.</i></span>&quot;
-</p></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-importance-wars.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-importance-once.html">Next</a></td></tr><tr><td width="33%" align="left">A Book that Wars </td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right"> Appendix: &quot;Once for
-All&quot;</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-importance-liberates.html b/docs/howto/html/h2-importance-liberates.html
deleted file mode 100644
index b2cd17d..0000000
--- a/docs/howto/html/h2-importance-liberates.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html><head><title>A Book that Liberates</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Importance of God's Word"><link rel="previous" href="h2-importance-works.html" title="A Book that Works"><link rel="next" href="h2-importance-wars.html" title="A Book that Wars"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>A Book that Liberates</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-importance-works.html">Prev</a></td><td align="center" class="center">Importance of God's Word</td><td align="right" class="right"><a accesskey="n" href="h2-importance-wars.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-liberates"></a>A Book that Liberates</h2></div></div><p>
-Jn.8:32 &quot;<span class="emphasis"><i>and you shall know the truth, and the truth shall make you
-free.</i></span>&quot;This is usually quoted by
-itself.  Is this a conditional or unconditional promise?  Would it apply to
-all kinds of knowledge?  Find the answers by examining the first half of the
-sentence, in v.31. &quot;<span class="emphasis"><i>If you abide in My word, then you are truly disciples of
-Mine... </i></span>&quot;</p><p>We see that this is a conditional promice, specifically speaking of the truth of God's word.</p><p>The Greek word for &quot;wind&quot; used in Eph.4:14 means a <span class="emphasis"><i>violent wind.</i></span>
-&quot;<span class="emphasis"><i>As a result, we are no longer to be children, tossed here and there by
-waves, and carried about by every wind of doctrine...</i></span>&quot;One
-thing studying the Bible does for us is to ground us in the truth, with the
-result that we won't be easily &quot;blown away.&quot;</p><p><span class="emphasis"><i>But Jesus answered and said to them, </i></span>&quot;<span class="emphasis"><i>You are mistaken [KJV Ye do err], not
-understanding the Scriptures, or the power of God.</i></span>&quot;Mt.22:29</p><p>What 2 things do we need to know to be kept from error?</p><div class="itemizedlist"><ul type="disc"><li><p>God's word</p></li><li><p>God's power </p></li></ul></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-importance-works.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-importance-wars.html">Next</a></td></tr><tr><td width="33%" align="left">A Book that Works </td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right"> A Book that Wars</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-importance-once.html b/docs/howto/html/h2-importance-once.html
deleted file mode 100644
index 30eff31..0000000
--- a/docs/howto/html/h2-importance-once.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<html><head><title>Appendix: &quot;Once for
-All&quot;</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Importance of God's Word"><link rel="previous" href="h2-importance-exhortations.html" title="Exhortations"><link rel="next" href="h2-importance-supplement.html" title="Supplement: Bible Reading
-Programs"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Appendix: &quot;Once for
-All&quot;</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-importance-exhortations.html">Prev</a></td><td align="center" class="center">Importance of God's Word</td><td align="right" class="right"><a accesskey="n" href="h2-importance-supplement.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-once"></a>Appendix: &quot;Once for
-All&quot;</h2></div></div><table border="0" width="100%" cellspacing="0" cellpadding="0" class="blockquote" summary="Block quote"><tr><td width="10%" valign="top"> </td><td width="80%" valign="top"><p>The truth regarding the
-finality of God's initiative in Christ is conveyed by one word of the Greek
-Testament, namely the adverb <i>hapax</i> and
-<i>ephapax</i>. It is usually translated in the
-Authorized Version once, meaning once for all. It is used of what is so done as
-to be of perpetual validity and never need repetition, and is applied in the NT
-to both revelation and redemption.  Thus, Jude refers to the faith which was
-once for all delivered to the saints (Jude 3), and Romans says,
-&quot;<span class="emphasis"><i>Christ also died for sins once for all</i></span>&quot;
-(Rom.6:10, see also 1 Pe.3:18; Heb.9:26-28). </p><p>
-Thus we may say that God has spoken once
-for all and Christ has suffered once for all.  This means that the Christian
-revelation and the Christian redemption are both alike in Christ complete.
-Nothing can be added to either without being derogatory to Christ...  These are
-the two rocks on which the Protestant Reformation was built -- Gods revealed
-word without the addition of human traditions and Christ's finished work without
-the addition of human merits.  The Reformers great watchwords were <i>sola
-scriptura</i> for our authority and <i>sola gratia</i> for our salvation.</p></td><td width="10%" valign="top"> </td></tr><tr><td colspan="2" align="right" valign="top">--<span class="attribution">John R. W. Stott, <span class="emphasis"><i>Christ the Controversialist,</i></span>
-InterVarsity Press 1978, pp.106-107</span></td><td width="10%" valign="top"> </td></tr></table></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-importance-exhortations.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-importance-supplement.html">Next</a></td></tr><tr><td width="33%" align="left">Exhortations </td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right"> Supplement: Bible Reading
-Programs</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-importance-supplement.html b/docs/howto/html/h2-importance-supplement.html
deleted file mode 100644
index 401301c..0000000
--- a/docs/howto/html/h2-importance-supplement.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html><head><title>Supplement: Bible Reading
-Programs</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Importance of God's Word"><link rel="previous" href="h2-importance-once.html" title="Appendix: &quot;Once for
-All&quot;"><link rel="next" href="h2-basics.html" title="Chapter 2. Bible Study Basics"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Supplement: Bible Reading
-Programs</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-importance-once.html">Prev</a></td><td align="center" class="center">Importance of God's Word</td><td align="right" class="right"><a accesskey="n" href="h2-basics.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-supplement"></a>Supplement: Bible Reading
-Programs</h2></div></div><p> Here are some easy programs to systematically read your
-Bible.  You can do more than one at a time if you like, for instance #1 with #4,
-or #2 with #5.  Vary the program from year to year to keep it fresh!
-</p><div class="orderedlist"><ol type="1"><li><p>New Testament in a Year: read one chapter each day, 5 days a
-week.</p></li><li><p>Proverbs in a Month: read one chapter of Proverbs each day,
-corresponding to the day of the month.</p></li><li><p>Psalms in a Month: read 5 Psalms at intervals of 30 each day,
-for instance on the 20th you read Ps.20, 50, 80, 110, &amp; 140.</p></li><li><p>Psalms &amp; Proverbs in 6 months: read through Psalms and Proverbs
-one chapter per day.</p></li><li><p>Old Testament without Psalms &amp; Proverbs in 2 years: if
-you read one chapter a day of the Old Testament, skipping over Psalms &amp; Proverbs, you will read the Old Testament in 2 years and 2 weeks.
-</p></li></ol></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-importance-once.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-basics.html">Next</a></td></tr><tr><td width="33%" align="left">Appendix: &quot;Once for
-All&quot; </td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right"> Bible Study Basics</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-importance-wars.html b/docs/howto/html/h2-importance-wars.html
deleted file mode 100644
index 9ace333..0000000
--- a/docs/howto/html/h2-importance-wars.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><head><title>A Book that Wars</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Importance of God's Word"><link rel="previous" href="h2-importance-liberates.html" title="A Book that Liberates"><link rel="next" href="h2-importance-exhortations.html" title="Exhortations"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>A Book that Wars</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-importance-liberates.html">Prev</a></td><td align="center" class="center">Importance of God's Word</td><td align="right" class="right"><a accesskey="n" href="h2-importance-exhortations.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-wars"></a>A Book that Wars</h2></div></div><p>
-Eph.6:10-18 is one picture of our spiritual armament.</p><div class="table"><p><b>Table 1.3. Spiritual Armor</b></p><table summary="Spiritual Armor" border="1"><colgroup><col><col></colgroup><thead><tr><th>Question</th><th>Answer</th></tr></thead><tbody><tr><td>How many of the weapons listed here are defensive weapons?</td><td>5</td></tr><tr><td>How many are offensive?</td><td>One</td></tr><tr><td>Which one(s)? </td><td>the word - <i>rhema</i></td></tr></tbody></table></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-importance-liberates.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-importance-exhortations.html">Next</a></td></tr><tr><td width="33%" align="left">A Book that Liberates </td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right"> Exhortations</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-importance-works.html b/docs/howto/html/h2-importance-works.html
deleted file mode 100644
index 9ef14c1..0000000
--- a/docs/howto/html/h2-importance-works.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<html><head><title>A Book that Works</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-importance.html" title="Chapter 1. Importance of God's Word"><link rel="previous" href="h2-importance-breathed.html" title="A Book that God Breathed"><link rel="next" href="h2-importance-liberates.html" title="A Book that Liberates"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>A Book that Works</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-importance-breathed.html">Prev</a></td><td align="center" class="center">Importance of God's Word</td><td align="right" class="right"><a accesskey="n" href="h2-importance-liberates.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-works"></a>A Book that Works</h2></div></div><p>
-What will studying the Bible do for you?  1 Thess.2:13 says that the Bible
-&quot;<span class="emphasis"><i>performs its work in you
-who believe.</i></span>&quot;  Beside each scripture, write down the work the Word
-performs.
-</p><div class="table"><p><b>Table 1.2. What does Bible study do for Christians?</b></p><table summary="What does Bible study do for Christians?" border="1"><colgroup><col><col></colgroup><thead><tr><th>Reference</th><th>Action</th></tr></thead><tbody><tr><td>Eph. 5:26
-</td><td>cleanses -- &quot;...having cleansed her by the washing of water with the word.&quot;
-</td></tr><tr><td>
-Acts 20:32
-</td><td>
-builds up --
-&quot;
-...the word of His grace, which is able to build you up and to give you the
-inheritance among all those who are sanctified.
-&quot;
-</td></tr><tr><td>
-Rom. 15:4
-</td><td>
-encourages -- &quot;that through perseverance and the
-encouragement of the Scriptures we might have hope.&quot;
-</td></tr><tr><td>
-Rom. 10:17
-</td><td>
-gives faith --
-&quot;So faith comes from hearing, and hearing by the word of
-Christ.&quot;
-</td></tr><tr><td>
-1 Cor. 10:11
-</td><td>
-instructs --
-&quot;Now these things happened to them for an example,
-and they were written for our instruction&quot;
-</td></tr><tr><td>
-Mt. 4:4
-</td><td>
-nourishment --
-&quot;But He answered and said, 'It is written, Man shall not live on bread alone,
-but on every word that proceeds out of the
-mouth of God.'&quot;
-</td></tr></tbody></table></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-importance-breathed.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-importance-liberates.html">Next</a></td></tr><tr><td width="33%" align="left">A Book that God Breathed </td><td width="34%" align="center"><a href="h2-importance.html">Up</a></td><td width="33%" align="right"> A Book that Liberates</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-importance.html b/docs/howto/html/h2-importance.html
deleted file mode 100644
index 9d24a50..0000000
--- a/docs/howto/html/h2-importance.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html><head><title>Chapter 1. Importance of God's Word</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="index.html" title="The Biblestudy HowTo"><link rel="previous" href="index.html" title="The Biblestudy HowTo"><link rel="next" href="h2-importance-breathed.html" title="A Book that God Breathed"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Importance of God's Word</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="index.html">Prev</a></td><td align="center" class="center"> </td><td align="right" class="right"><a accesskey="n" href="h2-importance-breathed.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="h2-importance"></a>Chapter 1. Importance of God's Word</h2></div></div><p>Understanding God's word is of great importance to all who call on
-God's name.  Study of the Bible is one of the primary ways that we learn to
-communicate with God.</p><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-importance-unique"></a>A Book that is
-Unique</h2></div></div><p>
-The Bible stands alone in many ways.  It is unique in:
-</p><div class="itemizedlist"><ul type="disc"><li><p>
-popularity.  Bible sales in North America:  more than $500 million per
-year.  The Bible is both the the all-time and year-to-year best seller!
-</p></li><li><p>
-authorship.  It was written over a period of 1600 years by 40 different
-authors from different backgrounds, yet reads as if written by one.
-</p></li><li><p>
-preservation.  F. F. Bruce in <span class="emphasis"><i>Are New Testament Documents Reliable?</i></span>
-compares New Testament manuscripts with other ancient texts:
-</p></li></ul></div><div class="table"><p><b>Table 1.1. Comparison of New Testament manuscripts with other ancient texts.</b></p><table summary="Comparison of New Testament manuscripts with other ancient texts." border="1"><colgroup><col><col><col><col><col></colgroup><thead><tr><th>Work</th><th>When Written</th><th>Earliest Copy</th><th>Time Lapse</th><th>Number of Copies</th></tr></thead><tbody><tr><td>Herodotus</td><td>448-428 B.C.</td><td>900 A.D.</td><td>1300 years</td><td>8
-</td></tr><tr><td>Tacitus</td><td>100 A.D.</td><td>1100 A.D.</td><td>1000 years</td><td>20
-</td></tr><tr><td>Caesar's <span class="emphasis"><i>Gallic War</i></span></td><td>50-58 B.C.</td><td>900 A.D.</td><td>950 years</td><td>10
-</td></tr><tr><td>Livy's <span class="emphasis"><i>Roman History</i></span></td><td>59 B.C. - 17 A.D.</td><td>900 A.D.</td><td>900 years</td><td>20
-</td></tr><tr><td>New Testament</td><td>40 A.D. - 100 A.D.</td><td>130 A.D. Partial manuscripts 350
-A.D. Full manuscripts</td><td>30 - 310 years</td><td>5000 Greek &amp; 10,000 Latin
-</td></tr></tbody></table></div><p>Ten copies of Caesar's <span class="emphasis"><i>Gallic War</i></span> exist, the earliest of which was copied
-900 years after Caesar wrote the original, etc.  For the New Testament we have
-full manuscripts dating to 350 A. D., papyri containing most of the New
-Testament from the 200s, and a fragment of John's gospel from 130 A. D.  How
-many manuscripts do we have to compare to each other?  5,000 in Greek and 10,000
-in Latin!  </p><table border="0" width="100%" cellspacing="0" cellpadding="0" class="blockquote" summary="Block quote"><tr><td width="10%" valign="top"> </td><td width="80%" valign="top"><p>&quot;In the verity and fullness of the evidence on which
-it rests, the text of the New Testament stands absolutely and unapproachably
-alone among other ancient prose writings.&quot; </p></td><td width="10%" valign="top"> </td></tr><tr><td colspan="2" align="right" valign="top">--<span class="attribution">Textual critic F. J. A. Hort, &quot;The New Testament in the
-Original Greek&quot;, vol. 1 p561, Macmillan Co., quoted in <span class="emphasis"><i>Questions of Life</i></span> p.
-25-26</span></td><td width="10%" valign="top"> </td></tr></table></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="index.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-importance-breathed.html">Next</a></td></tr><tr><td width="33%" align="left">The Biblestudy HowTo </td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right"> A Book that God Breathed</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-rules-context.html b/docs/howto/html/h2-rules-context.html
deleted file mode 100644
index c7a9021..0000000
--- a/docs/howto/html/h2-rules-context.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html><head><title>Rule 2 - Interpret within the biblical
-context</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-rules.html" title="Chapter 3. Rules of Bible Interpretation (Hermeneutics)"><link rel="previous" href="h2-rules.html" title="Chapter 3. Rules of Bible Interpretation (Hermeneutics)"><link rel="next" href="h2-rules-hcontest.html" title="Rule 3 - Interpret within the historical and
-cultural context"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Rule 2 - Interpret within the biblical
-context</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-rules.html">Prev</a></td><td align="center" class="center">Rules of Bible Interpretation (Hermeneutics)</td><td align="right" class="right"><a accesskey="n" href="h2-rules-hcontest.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-rules-context"></a>Rule 2 - Interpret within the biblical
-context</h2></div></div><p>Interpret scripture in harmony with other scripture.  What do the
-verses on each side say?  What is the theme of the chapter?  the book?  Does your interpretation fit with these?  If not,
-it is flawed.  Usually, the context supplies what we need to correctly interpret the passage.  Context is key.  If
-confusion remains as to the meaning after we have interpreted the text within its context, we have to look further.</p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-rules-context-ex2a"></a>Example 2A</h3></div></div><p>In a previous lesson we considered Jn.3:5 <span class="emphasis"><i>&quot;born of water and the Spirit.&quot;</i></span>  In context, what is
-the water under discussion here?</p><p>Water baptism is not under discussion here, which would be a big switch from the subject being
-discussed by Jesus and Nicodemus.  Watch out for a sudden change of topic, it may be a clue that your
-interpretation has been derailed!  The water is the amniotic fluid, &quot;born of water&quot; = natural birth.</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-rules-context-ex2b"></a>Example 2B</h3></div></div><p>1 Cor.14:34  <span class="emphasis"><i>&quot;Let the women keep silent in the churches&quot;</i></span>  has to be taken within the biblical
-context of 1 Cor.11:5 <span class="emphasis"><i>&quot;every woman...while praying or prophesying...&quot;</i></span></p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-rules-context-ex2c"></a>Example 2C</h3></div></div><p>Acts 2:38 <span class="emphasis"><i>And Peter said to them, &quot;Repent,
-and let each of you be baptized in the name of
-Jesus Christ for the forgiveness of your sins...&quot;</i></span>  Is this teaching baptismal regeneration?  	If this was the
-only verse of scripture we had, we would have to conclude that.  But in the light of the clear teaching
-elsewhere that regeneration happens by faith in Christ, we have to interpret it otherwise.  Peter is urging
-baptism as a way for his hearers to respond to the gospel.  If baptism were the pathway to being born again,
-how could Paul write 1 Cor.1:17 <span class="emphasis"><i>&quot;For Christ did not send me to baptize, but to preach the gospel&quot;</i></span>?
-</p></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-rules.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-rules-hcontest.html">Next</a></td></tr><tr><td width="33%" align="left">Rules of Bible Interpretation (Hermeneutics) </td><td width="34%" align="center"><a href="h2-rules.html">Up</a></td><td width="33%" align="right"> Rule 3 - Interpret within the historical and
-cultural context</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-rules-hcontest.html b/docs/howto/html/h2-rules-hcontest.html
deleted file mode 100644
index b14a6ec..0000000
--- a/docs/howto/html/h2-rules-hcontest.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html><head><title>Rule 3 - Interpret within the historical and
-cultural context</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-rules.html" title="Chapter 3. Rules of Bible Interpretation (Hermeneutics)"><link rel="previous" href="h2-rules-context.html" title="Rule 2 - Interpret within the biblical
-context"><link rel="next" href="h2-rules-normal.html" title="Rule 4 - Interpret according to the normal
-usage of words in language"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Rule 3 - Interpret within the historical and
-cultural context</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-rules-context.html">Prev</a></td><td align="center" class="center">Rules of Bible Interpretation (Hermeneutics)</td><td align="right" class="right"><a accesskey="n" href="h2-rules-normal.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-rules-hcontest"></a>Rule 3 - Interpret within the historical and
-cultural context</h2></div></div><p>
-At first we are not asking  &quot;What does it mean to
-me?&quot; but &quot;What did it mean to the original readers?&quot;; later we can ask, &quot;What does it mean to me?&quot;  We have to take
-into account the historical and cultural background of the author and the recipients.</p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-rules-hcontest-ex3a"></a>Example 3A</h3></div></div><p>  &quot;3 days &amp; 3 nights&quot; (Mt.12:40) have
-led some to come up with a &quot;Wednesday crucifixion
-theory,&quot; esp. the cult of Armstrongism.  How could Jesus die on Friday afternoon and rise Sunday morning
-yet &quot;be raised on the third day&quot; (Mt.16:21)?  Exact meanings of &quot;three&quot; or &quot;days&quot; won't help explain the
-apparent contradiction.</p><p>We need an historical tidbit: Jews counted any part of a day as a full day, as we would count buckets
-of water (if there were six and one-half buckets of water, we would say there were 7 buckets of water even if one was only partly full).  So to the Jewish
-mind, any part of a day counted as a full day, and days started at 6 p.m. and ended at 6 a.m.  Friday from 3
-p.m. to 6 p.m. = day 1.  Friday 6 p.m. to Saturday 6 p.m. = day 2.  Saturday 6 p.m. to Sunday 5 or so a.m. =
-day 3.  Interpreting within the cultural context keeps us out of trouble.</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-rules-hcontest-ex3b"></a>Example 3B</h3></div></div><p>Gen.15:7-21.  The historical context
-is that cutting animals in two and then walking between
-the pieces was the normal way of entering a contract in Abraham's day.  Both parties walked between, taking
-the pledge that dismemberment would happen to them if they didn't live up to their part of the contract.  But
-in this case only God goes thru, making it a unilateral covenant.</p></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-rules-context.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-rules-normal.html">Next</a></td></tr><tr><td width="33%" align="left">Rule 2 - Interpret within the biblical
-context </td><td width="34%" align="center"><a href="h2-rules.html">Up</a></td><td width="33%" align="right"> Rule 4 - Interpret according to the normal
-usage of words in language</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-rules-normal.html b/docs/howto/html/h2-rules-normal.html
deleted file mode 100644
index d79fbc0..0000000
--- a/docs/howto/html/h2-rules-normal.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html><head><title>Rule 4 - Interpret according to the normal
-usage of words in language</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-rules.html" title="Chapter 3. Rules of Bible Interpretation (Hermeneutics)"><link rel="previous" href="h2-rules-hcontest.html" title="Rule 3 - Interpret within the historical and
-cultural context"><link rel="next" href="h2-rules-parables.html" title="Rule 5 - Understand the purpose of
-parables and the difference between a parable and an allegory"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Rule 4 - Interpret according to the normal
-usage of words in language</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-rules-hcontest.html">Prev</a></td><td align="center" class="center">Rules of Bible Interpretation (Hermeneutics)</td><td align="right" class="right"><a accesskey="n" href="h2-rules-parables.html">Next</a></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-rules-normal"></a>Rule 4 - Interpret according to the normal
-usage of words in language</h2></div></div><p>Let literal language be literal and
-figurative language be figurative.  And watch out for idioms, which have special meanings.</p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-rules-normal-ex4a"></a>Example 4A</h3></div></div><p>&quot;evil eye&quot; in Mt.6:23. </p><p>Rule 1, definition of &quot;evil&quot; and &quot;eye&quot; - no help here.  Rule 2, context:  seems to confuse us even
-more.  It doesn't seem to fit with what goes before and after!  This should tip us off that we aren't
-understanding it rightly!!</p><p>What we have here is a Hebrew idiom, &quot;evil eye.&quot;  Let's look up other uses of this idiom: Mt.20:15
-&quot;<span class="emphasis"><i>Is it not lawful for me to do what I wish with what is my own?  Or is your eye envious [lit.&quot;evil&quot;] because I
-am generous [lit.&quot;good&quot;]?</i></span>&quot;  We find that having an &quot;evil eye&quot; is a Hebrew idiom for being stingy or envious.
-Now go back to Mt.6 and notice how this understanding ties in so perfectly to the context.</p><div class="section"><div class="titlepage"><div><h4 class="title"><a name="h2-rules-normal-ex4b"></a>Example 4B</h4></div></div><p>Is.59:1 &quot;<span class="emphasis"><i>The Lord's hand is not short;</i></span>&quot; Deut.33:27 &quot;<span class="emphasis"><i>Underneath are the everlasting arms.</i></span>&quot;
-References to body parts of God are used by Latter-Day Saints to prove that God was once a man just as we
-are.  Once they convince people of that, they go on to teach that we can become God just like He is!  At a
-lecture he was giving, a group of Mormon elders challenged Walter Martin (author of <span class="emphasis"><i>Kingdom of the Cults</i></span>)
-with an enumeration of verses like these.  Dr. Martin then asked the Mormons to read one more scripture:
-Ps.91:4 &quot;<span class="emphasis"><i>He will cover you with His feathers; And under His wings shalt thou trust.</i></span>&quot;  W.M. said, &quot;By the same
-rules of interpretation that you just proved God to be a man, you just proved that He is a bird.&quot;  The Mormons
-had to laugh as they realised the ridiculousness of their position.
-</p></div></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-rules-hcontest.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-rules-parables.html">Next</a></td></tr><tr><td width="33%" align="left">Rule 3 - Interpret within the historical and
-cultural context </td><td width="34%" align="center"><a href="h2-rules.html">Up</a></td><td width="33%" align="right"> Rule 5 - Understand the purpose of
-parables and the difference between a parable and an allegory</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-rules-parables.html b/docs/howto/html/h2-rules-parables.html
deleted file mode 100644
index 609055e..0000000
--- a/docs/howto/html/h2-rules-parables.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><head><title>Rule 5 - Understand the purpose of
-parables and the difference between a parable and an allegory</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="h2-rules.html" title="Chapter 3. Rules of Bible Interpretation (Hermeneutics)"><link rel="previous" href="h2-rules-normal.html" title="Rule 4 - Interpret according to the normal
-usage of words in language"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Rule 5 - Understand the purpose of
-parables and the difference between a parable and an allegory</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-rules-normal.html">Prev</a></td><td align="center" class="center">Rules of Bible Interpretation (Hermeneutics)</td><td align="right" class="right"></td></tr></tbody></table></div></div><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-rules-parables"></a>Rule 5 - Understand the purpose of
-parables and the difference between a parable and an allegory</h2></div></div><p>An allegory is:  A STORY WHERE EACH ELEMENT HAS A MEANING </p><p>Every parable is an allegory, true or false?</p><p>Some parables are allegories, for instance, the parable of the sower is an allegory:  the seed is the word of
-God, the thorns are worries and greed, etc.  But most parables are not allegories but simply stories to illustrate one
-point.    It's dangerous to get our doctrine from parables; they can be twisted to say all sorts of things.  We need to get
-our doctrine from clear scriptures that lay it out; then if a parable illustrates that, fine.</p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-rules-parables-ex5a"></a>Example 5A</h3></div></div><p>The parable of the widow with the unrighteous judge in Lk.18:1-8.  This story illustrates one
-lesson:  boldness in prayer.  If we draw it into an allegory, what do we have?</p><p>All sorts of violence happens to the meanings: God is reluctant to protect the rights of widows, prayer
-&quot;bothers&quot; Him, etc.</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-rules-parables-ex5b"></a>Example 5B</h3></div></div><p>The parable of the unrighteous steward in Lk.16:1-9.   What is the point of the parable?  Is it
-an allegory? </p><p>The steward is commended for only one thing, his shrewdness in using what he had to prepare for a
-time when he wouldn't have it.  But he is not commended for his unethical behavior in cheating his master. </p></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-rules-normal.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"></td></tr><tr><td width="33%" align="left">Rule 4 - Interpret according to the normal
-usage of words in language </td><td width="34%" align="center"><a href="h2-rules.html">Up</a></td><td width="33%" align="right"> </td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/h2-rules.html b/docs/howto/html/h2-rules.html
deleted file mode 100644
index c0ffd39..0000000
--- a/docs/howto/html/h2-rules.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<html><head><title>Chapter 3. Rules of Bible Interpretation (Hermeneutics)</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="up" href="index.html" title="The Biblestudy HowTo"><link rel="previous" href="h2-basics-worksheet.html" title="Worksheet: How to Use a Concordance"><link rel="next" href="h2-rules-context.html" title="Rule 2 - Interpret within the biblical
-context"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>Rules of Bible Interpretation (Hermeneutics)</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"><a accesskey="p" href="h2-basics-worksheet.html">Prev</a></td><td align="center" class="center"> </td><td align="right" class="right"><a accesskey="n" href="h2-rules-context.html">Next</a></td></tr></tbody></table></div></div><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="h2-rules"></a>Chapter 3. Rules of Bible Interpretation (Hermeneutics)</h2></div></div><p>We already learned about the &quot;3 Cs&quot;: content, context, cross-reference.  We want to expand that now by
-delving briefly into biblical hermeneutics, whose goal is to discover the meaning intended by the original author (and
-Author!).  While many applications of a passage are valid, only one interpretation is valid.  The scripture itself says
-this by saying that no scripture is of any private interpretation (2 Pe.1:20 KJV <span class="emphasis"><i>&quot;Knowing this first, that no
-prophesy of scripture is of any private interpretation.&quot;</i></span>)  Certain rules are helps toward discovering the correct meaning;
-by ignoring these rules people have brought much trouble on themselves and their followers.  2 Pe.3:16 <span class="emphasis"><i>&quot;...in which are
-some things hard to understand, which the untaught and unstable distort, as they do also the rest of the Scriptures, to
-their own destruction.&quot;</i></span></p><p>How do we go about discovering the intended meaning of a passage?  Let's say your attention has been
-drawn to a particular verse whose meaning is not clear to you.  How do you study it out?  Keep these rules in mind:</p><div class="section"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="h2-rules-exact"></a>Rule 1 - Interpret according to the exact
-meaning of the words.</h2></div></div><p>The more precise we can be with the exact, original meaning of the words the better our interpretation will be.
-Try to find the exact meaning of the key words by following these steps:</p><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-rules-exact-definition"></a>Step 1) Definition</h3></div></div><p>Look up the definition in a Greek or Hebrew dictionary.  For verbs, the verb tense is also
-crucial.</p></div><div class="section"><div class="titlepage"><div><h3 class="title"><a name="h2-rules-exact-crossref"></a>Step 2) Cross-reference</h3></div></div><p>Compare scripture with scripture.  Seeing how the same Greek or Hebrew word
-(not the English word) is used in scripture may clarify or throw new light on the definition.  How does the same author
-use this word elsewhere?  Other authors?  Your reference tools may give you uses of the word in non-biblical
-documents, as well.  Why do we have to go to the original languages; why isn't the English word good enough?
-BECAUSE MORE THAN ONE GREEK WORD MAY BE TRANSLATED INTO THE SAME ENGLISH WORD, AND THE GREEK
-WORDS MAY HAVE DIFFERENT SHADES OF MEANING.</p><div class="section"><div class="titlepage"><div><h4 class="title"><a name="h2-rules-exact-crossref-ex1a"></a>Example 1A</h4></div></div><p>Jn.20:17 <span class="emphasis"><i>&quot;Touch me not&quot;</i></span> (KJV) sounds harsh, doesn't it?  Sounds like Jesus doesn't want
-to be touched now that He is risen, that He is too holy or something.  But that doesn't seem right, so let's look
-it up in Spiros Zodhiates' <span class="emphasis"><i>The Complete Word Study New Testament</i></span> (AMG Publishers, 1991).</p><p>Definition:  Turning to John 20:17, above the word &quot;Touch&quot; we see &quot;pim680.&quot;  The letters
-give us a code for the part of speech, and the number refers to Strong's dictionary reference.  Let's look up
-the definition  (p. 879).  &quot;680.  Haptomai; from hapto (681), touch.  Refers to such handling of an object as to exert a modifying
-influence upon it... Distinguished from pselaphao (5584), which actually only means to touch the surface of something. &quot;   Now look
-up &quot;pim.&quot;  The grammar codes in Zodhiates come right after Revelation; on p. 849 we see that pim stands for
-&quot;present imperative active (80)&quot;.  On p.857, &quot;Present Imperative.  In the active voice, it may indicate a command to do
-something in the future which involves continuous or repeated action or, when it is negated, a command to stop doing something. &quot; This
-is a negative command, so it is to stop doing something that is already occuring.  So, what have we found?</p><p><span class="emphasis"><i>MARY IS ALREADY CLINGING TO JESUS, AND HE IS SAYING TO STOP HOLDING HIM!</i></span></p></div><div class="section"><div class="titlepage"><div><h4 class="title"><a name="h2-rules-exact-crossref-ex1b"></a>Ex. 1B</h4></div></div><p>In James 5:14, <span class="emphasis"><i>Elders are told to pray and anoint someone who is sick</i></span>.  What is this anointing?</p><p>Definition of aleipho (218) - &quot;to oil&quot; (Strong's); but we also have another Greek word translated
-&quot;anoint&quot;, chrio (5548) - &quot;to smear or rub with oil, i.e. to consecrate to an office or religious service&quot; (Strong's).
- Since it's a verb, consider the tense also, &quot;apta&quot; aorist participle active.  &quot;The aorist participle expresses simple action,
-as opposed to continuous action...When its relaitonship to the main verb is temporal, it usually signifies action prior to that of the main
-verb.&quot; (Zodhiates p.851)</p><pre class="screen">
-Cross-references for aleipho:
-  Mt.6:17 But you, when you fast, anoint your head
-  Mk.16:1 [the women] brought spices that they might come and anoint Him.
-  Mk.6:13 And they were...anointing with oil many sick people and healing them.
-  Lk.7:38 ...kissing His feet and anointing them with the perfume
-  Jn.12:3 Mary...anointed the feet of Jesus, and wiped them with her hair
-Cross-references of chrio:
-  Lk.4:18 The Spirit of the Lord is upon me, because He has anointed me to preach...&quot;
-  Acts 4:27 Jesus, whom Thou hast anointed
-  Acts 10:38 God anointed Jesus with the Holy Ghost and power
-  2 Cor.1:21 Now He who...anointed us is God
-</pre><p>So what's the difference between aleipho and chrio?  Look back over the cross-references and the
-definitions, and sum up the difference:   ALEIPHO IS A PRACTICAL USE OF OIL AND CHRIO IS A SPIRITUAL </p><p>As an illustration (although the word is not used) of the practical use of oil at that time, when the good
-Samaritan cared for the man beat up by robbers he poured oil and wine in the wound.  So oil had a medicinal
-use in Jesus' day.
-</p><p>Now let's apply what we just learned by this word study to James 5:14  <span class="emphasis"><i>&quot;Is any among you sick?  Let
-him call for the elders of the church; and let them pray over him, anointing him with oil in the name of the
-Lord.&quot;</i></span>  Is &quot;anointing&quot; spiritual or practical?   Practical!</p><p>
-And the tense in Greek, the aorist participle, would
-be better translated &quot;having anointed,&quot; so the order is the anointing first, then the prayer (&quot;in the name of the
-Lord&quot;refers to the prayer, not the anointing).  James 5 is saying that the elders should give the sick person
-medicine and pray for him in the name of the Lord.  Doesn't that express a beautiful balance of practical and
-spiritual in our God!
-</p></div></div></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"><a href="h2-basics-worksheet.html">Prev</a></td><td width="34%" align="center" valign="top"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top"><a href="h2-rules-context.html">Next</a></td></tr><tr><td width="33%" align="left">Worksheet: How to Use a Concordance </td><td width="34%" align="center"><a href="index.html">Up</a></td><td width="33%" align="right"> Rule 2 - Interpret within the biblical
-context</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/html/index.html b/docs/howto/html/index.html
deleted file mode 100644
index 0d05343..0000000
--- a/docs/howto/html/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html><head><title>The Biblestudy HowTo</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="Bible, Study, HowTo"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Biblestudy HowTo"><link rel="next" href="h2-importance.html" title="Chapter 1. Importance of God's Word"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="headline" style="position : absolute;                 height : 85px;                 z-index : 100;                 background : transparent;                 text-align : center;   text-transform: smallcaps;                 width : 100%;                 top : 0px;                 left : 0px;                 width : 100%;                 color : #000000;"><h1>The Biblestudy HowTo</h1></div><div id="navbackground" style="position : absolute;   width : 100%;   height : 124px;   background-image : url('help:/common/doctop2.png');   z-index : 5;   left : 0px;   top : 0px;   padding : 0px;"><div id="bulb1" style="padding : 0px;   position : absolute;   z-index : 15;   width : 150px;   height : 85px;   top : 0px;   left : 0px;   background : url('help:/common/doctop1.png') repeat;"></div><div id="gradient" style="  position : absolute;   width : 275px;   height : 85px;   z-index : 19px;   top : 0px;   padding : 0px;   left : 150px;   background-image : url('help:/common/doctop1a.png');   background-repeat : no-repeat;   background-color : transparent;   visibility : visible;"></div><div id="bulb-bit" style="position : absolute;   width : 100%;   height : 25px;   top : 85px;   left : 0px;   background-image : url('help:/common/doctop1b.png');   background-repeat : no-repeat;   background-color : transparent;   z-index : 5;"><table width="100%" id="navtable"><tbody><tr><td align="left" class="left"></td><td align="center" class="center"> </td><td align="right" class="right"><a accesskey="n" href="h2-importance.html">Next</a></td></tr></tbody></table></div></div><div class="book"><div class="titlepage"><div><h1 class="title"><a name="id2778273"></a>The Biblestudy HowTo</h1></div><div><h3 class="author">Bob Harman </h3></div><div><br>Revision <span class="releaseinfo">1.01.00<br></span></div><div><p class="copyright">Copyright © 2001, 2002, 2003 The team of BibleTime, info@bibletime.info</p></div><div><p class="copyright">Copyright © 2001, 2002, 2003 Bob Harman</p></div><div><div class="legalnotice"><p>
-The copyright of this text is held by the author Bob Harman.  The text was adapted for
-publication with BibleTime by Fred Saalbach.</p><p> Non exclusive serial rights for this distribution of
-this document with the BibleTime Software have been made. Redistribution as part
-of the Bibletime software without modification and limited reproduction
-as provided by the &quot;fair use&quot; provisions of the US copyright code are
-also permitted.</p><p> For questions regarding the use of this
-material contact Bob Harman c/o New Covenant Church 1079 Big Bethel Rd. Hampton
-VA 23666 USA <tt>&lt;<a href="mailto:ncc@ncchampton.org">ncc@ncchampton.org</a>&gt;</tt>.</p><p>Scripture quotes are from the New American Standard Bible unless otherwise indicated</p></div></div><div><div><div class="abstract"><p><b>Abstract</b></p><p>
-The Biblestudy HowTo is a guide for studying the Bible.
-</p><p>It is the hope of the BibleTime team that this HowTo will provoke the
-readers to study the scriptures to see what they say.  This
-particular study guide has been chosen as it takes care not to
-advocate any particular denominational doctrine.  We expect you to read
-and study the scriptures to understand what they say.  If you start
-with the attitude that you want to have the Lord sow his word in your
-heart He will not disappoint you.</p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="h2-importance.html">Importance of God's Word</a></dt><dd><dl><dt><a href="h2-importance.html#h2-importance-unique">A Book that is
-Unique</a></dt><dt><a href="h2-importance-breathed.html">A Book that God Breathed</a></dt><dt><a href="h2-importance-works.html">A Book that Works</a></dt><dt><a href="h2-importance-liberates.html">A Book that Liberates</a></dt><dt><a href="h2-importance-wars.html">A Book that Wars</a></dt><dt><a href="h2-importance-exhortations.html">Exhortations</a></dt><dt><a href="h2-importance-once.html">Appendix: &quot;Once for
-All&quot;</a></dt><dt><a href="h2-importance-supplement.html">Supplement: Bible Reading
-Programs</a></dt></dl></dd><dt>2. <a href="h2-basics.html">Bible Study Basics</a></dt><dd><dl><dt><a href="h2-basics.html#h2-basics-purpose">Our Purpose as we Approach the Bible</a></dt><dt><a href="h2-basics-approaches.html">Approaches to God's Word</a></dt><dd><dl><dt><a href="h2-basics-approaches.html#h2-basics-approaches-hear">Hear </a></dt><dt><a href="h2-basics-approaches.html#h2-basics-approaches-read">Read  </a></dt><dt><a href="h2-basics-approaches.html#h2-basics-approaches-study">Study </a></dt><dt><a href="h2-basics-approaches.html#h2-basics-approaches-memorize">Memorize </a></dt><dt><a href="h2-basics-approaches.html#h2-basics-approaches-meditate">Meditate</a></dt></dl></dd><dt><a href="h2-basics-types.html">Types of Bible Studies</a></dt><dd><dl><dt><a href="h2-basics-types.html#basics-types-topical">Topical Study</a></dt><dt><a href="h2-basics-types.html#h2-basics-types-character">Character Study</a></dt><dt><a href="h2-basics-types.html#basics-types-expository">Expository Study</a></dt></dl></dd><dt><a href="h2-basics-interpretation.html">Basics of Correct Interpretation</a></dt><dd><dl><dt><a href="h2-basics-interpretation.html#h2-basics-interpretation-content">Content</a></dt><dt><a href="h2-basics-interpretation.html#h2-basics-interpretation-context">Context</a></dt><dt><a href="h2-basics-interpretation.html#h2-basics-interpretation-cross">Cross-reference</a></dt></dl></dd><dt><a href="h2-basics-expository.html">An Expository Study
-of Matthew 6:1-18</a></dt><dt><a href="h2-basics-worksheet.html">Worksheet: How to Use a Concordance</a></dt><dd><dl><dt><a href="h2-basics-worksheet.html#h2-basics-worksheet-select">To Find a Particular Verse</a></dt><dt><a href="h2-basics-worksheet.html#h2-basics-worksheet-study">To Do a Topical Study </a></dt><dt><a href="h2-basics-worksheet.html#h2-basics-worksheet-clarify">To Clarify Word Meanings in the Greek and Hebrew</a></dt><dt><a href="h2-basics-worksheet.html#h2-basics-worksheet-names">To Find Meanings of Names</a></dt></dl></dd></dl></dd><dt>3. <a href="h2-rules.html">Rules of Bible Interpretation (Hermeneutics)</a></dt><dd><dl><dt><a href="h2-rules.html#h2-rules-exact">Rule 1 - Interpret according to the exact
-meaning of the words.</a></dt><dd><dl><dt><a href="h2-rules.html#h2-rules-exact-definition">Step 1) Definition</a></dt><dt><a href="h2-rules.html#h2-rules-exact-crossref">Step 2) Cross-reference</a></dt></dl></dd><dt><a href="h2-rules-context.html">Rule 2 - Interpret within the biblical
-context</a></dt><dd><dl><dt><a href="h2-rules-context.html#h2-rules-context-ex2a">Example 2A</a></dt><dt><a href="h2-rules-context.html#h2-rules-context-ex2b">Example 2B</a></dt><dt><a href="h2-rules-context.html#h2-rules-context-ex2c">Example 2C</a></dt></dl></dd><dt><a href="h2-rules-hcontest.html">Rule 3 - Interpret within the historical and
-cultural context</a></dt><dd><dl><dt><a href="h2-rules-hcontest.html#h2-rules-hcontest-ex3a">Example 3A</a></dt><dt><a href="h2-rules-hcontest.html#h2-rules-hcontest-ex3b">Example 3B</a></dt></dl></dd><dt><a href="h2-rules-normal.html">Rule 4 - Interpret according to the normal
-usage of words in language</a></dt><dd><dl><dt><a href="h2-rules-normal.html#h2-rules-normal-ex4a">Example 4A</a></dt></dl></dd><dt><a href="h2-rules-parables.html">Rule 5 - Understand the purpose of
-parables and the difference between a parable and an allegory</a></dt><dd><dl><dt><a href="h2-rules-parables.html#h2-rules-parables-ex5a">Example 5A</a></dt><dt><a href="h2-rules-parables.html#h2-rules-parables-ex5b">Example 5B</a></dt></dl></dd></dl></dd></dl></div></div><div id="bottom-nav" style="position : relative;                 width : 100%;                 height : 185px;                 left : 0px;   right : 0px;                 top : 0px;   margin-top: 100px;                 background-image : url('help:/common/bottom1.png');                 background-repeat : repeat-x;                 background-color : transparent;   margin-left: 0px;   margin-right: 0px;                 z-index : 25;"><img src="help:/common/bottom2.png" align="right" height="59" width="227" alt="KDE Logo"><div id="navtable2" style="width : 100%;   margin-left: 0px;          margin-right: 0px;                      z-index : 15;                  background-color : transparent;"><table width="100%" border="0" cellpadding="0" cellspacing="0" style="position: absolute;         top: 70px;         left: 0px;"><tr><td width="33%" align="left" valign="top"></td><td width="34%" align="center" valign="top"> </td><td width="33%" align="right" valign="top"><a href="h2-importance.html">Next</a></td></tr><tr><td width="33%" align="left"> </td><td width="34%" align="center"> </td><td width="33%" align="right"> Importance of God's Word</td></tr></table></div></div></body></html>
\ No newline at end of file
diff --git a/docs/howto/unicode/Makefile.am b/docs/howto/unicode/Makefile.am
deleted file mode 100644
index 57b377b..0000000
--- a/docs/howto/unicode/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-
-EXTRA_DIST = how2-basics.docbook how2-importance.docbook how2-interpretation.docbook index.docbook 
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  how2-basics.docbook how2-importance.docbook how2-interpretation.docbook index.docbook; do \
-	  $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/howto; \
-	  chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/$$file; \
-	done;
-	ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/common;\
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  how2-basics.docbook how2-importance.docbook how2-interpretation.docbook index.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/common;
diff --git a/docs/howto/unicode/Makefile.in b/docs/howto/unicode/Makefile.in
deleted file mode 100644
index 864e3c2..0000000
--- a/docs/howto/unicode/Makefile.in
+++ /dev/null
@@ -1,511 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# this Makefile.am was automatically generated by bibletime/docs/gen_am.sh
-# please do not edit this file but rather run the script to update
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-
-EXTRA_DIST = how2-basics.docbook how2-importance.docbook how2-interpretation.docbook index.docbook 
-subdir = docs/howto/unicode
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  docs/howto/unicode/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/howto/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/howto/unicode/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-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:
-
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-data-local 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 uninstall-local
-
-
-install-data-local:
-	mkdir -p $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/;
-	chmod -R a+r+X  $(DESTDIR)$(kde_htmldir)/en/bibletime;
-	for file in  how2-basics.docbook how2-importance.docbook how2-interpretation.docbook index.docbook; do \
-	  $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(kde_htmldir)/en/bibletime/howto; \
-	  chmod a+r $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/$$file; \
-	done;
-	ln -sf ../../common $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/common;\
-	chmod -R a+r+X $(DESTDIR)$(kde_htmldir)/en/bibletime
-
-uninstall-local:
-	for file in  how2-basics.docbook how2-importance.docbook how2-interpretation.docbook index.docbook; do \
-	  echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/$$file; \
-	  rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/$$file; \
-	done;
-	echo Removing $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/common;
-	rm -f $(DESTDIR)$(kde_htmldir)/en/bibletime/howto/common;
-# 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:
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/howto/unicode/Makefile
-	cd $(top_srcdir) && perl admin/am_edit docs/howto/unicode/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/docs/howto/unicode/how2-basics.docbook b/docs/howto/unicode/how2-basics.docbook
deleted file mode 100644
index 63ab544..0000000
--- a/docs/howto/unicode/how2-basics.docbook
+++ /dev/null
@@ -1,179 +0,0 @@
-<chapter id="h2-basics"><title>Bible Study Basics</title>
-
-<section id="h2-basics-purpose">
-<title>Our Purpose as we Approach the Bible</title>
-<para>
-Jn.5:39-40<emphasis>"You search the Scriptures, because you think that
-in them you have eternal life; and it is these that bear witness of Me; and you
-are unwilling to come to Me, that you may have life."</emphasis>
-</para>
-
-<para>The chief purpose of the book is to bring us to the Person.  Martin Luther
-said "we go to the cradle only for the sake of the baby"; just so
-in Bible study, we do it not for its own sake but for fellowship with God.
-</para>
-<blockquote><attribution>John R.W. Stott, <emphasis>Christ the
-Controversialist</emphasis>, InterVarsity Press 1978, pp.97, 104.</attribution>
-<para>The Jews to whom Jesus spoke... imagined that to possess Scripture was
-tantamount to possessing life. Hillel used to say, "He who has gotten to
-himself words of Torah has gotten to himself the life of the world to
-come."  Their study was an end in itself.  In this they were grievously
-deceived. ...</para>
-<para>There is neither merit nor profit in the reading of
-Scripture for its own sake, but only if it effectively introduces us to Jesus
-Christ.  Whenever the Bible is read, what is needed is an eager expectation that
-through it we may meet Christ.</para>  </blockquote>
-</section>
-
-<section id="h2-basics-approaches">
-<title>Approaches to God's Word</title>
-<para>Hearing and reading provide a telescopic view of the scripture while study
-and memorization provide a microscopic view of scripture.  Meditating on the
-scriptures brings hearing, reading, studying and memorization together and
-cements the word in our minds.</para>
-
-<section id="h2-basics-approaches-hear">
-<title>Hear </title>
-<para>Lk.11:28 <emphasis>"blessed are those who hear the word of God, and
-observe it."</emphasis></para>
-</section>
-
-<section id="h2-basics-approaches-read">
-<title>Read  </title> <para>Rev.1:3
-<emphasis>"Blessed is he who reads and those who hear the words of this
-prophecy..."</emphasis></para>
-<para>1 Tim.4:13 <emphasis>"give
-attention to the public reading of Scripture..."</emphasis></para>
-</section>
-
-<section id="h2-basics-approaches-study"><title>Study </title>
-<para>Acts 17:11 <emphasis>"Now these were more noble-minded than those in
-Thessalonica, for they received the word with great eagerness, examining the
-Scriptures daily, to see whether these things were so."</emphasis></para>
-<para>2 Tim.2:15 <emphasis>"Be diligent [KJV `Study'] to present yourself
-approved to God as a workman who does not need to be ashamed, handling
-accurately the word of truth."</emphasis></para>
-</section>
-
-<section id="h2-basics-approaches-memorize">
-<title>Memorize </title>
-<para>Ps.119:11 <emphasis>"Thy word I have hid in my heart, that I may not
-sin against Thee."</emphasis></para> </section>
-
-<section id="h2-basics-approaches-meditate"><title>Meditate</title>
-<para>Ps.1:2-3 <emphasis>"But his delight is in the law of the Lord, And
-in His law he meditates day and night. And he will be like a tree firmly planted
-by streams of water, Which yields its fruit in its season, And its leaf does not
-wither; And in whatever he does, he prospers."</emphasis></para>
-<para>The Navigators illustrate this by saying that as the thumb can touch all
-the fingers, we can meditate on the Word as we do any of the first four.
-Meditation is a key to revelation. A new Christian needs to hear and read the
-Bible more than they need to study and memorize it. This is so that they become
-familiar with the overall message of the Bible. </para> </section>
-</section>
-
-<section id="h2-basics-types"><title>Types of Bible Studies</title> <section
-id="basics-types-topical"><title>Topical Study</title> <para>Pick out a certain
-topic and follow it through, using cross-references or a
-concordance.</para>
-</section>
-
-<section id="h2-basics-types-character"><title>Character Study</title>
-<para>Studying the life of a Bible character, e.g. Joseph's life in
-Gen.37-50.</para></section> <section
-id="basics-types-expository"><title>Expository Study</title> <para>Studying a
-certain passage:  paragraph, chapter, or book.</para></section>
-</section>
-
-<section id="h2-basics-interpretation">
-<title>Basics of Correct Interpretation</title>
-
-<section id="h2-basics-interpretation-content">
-<title>Content</title>
-<para>What does it say?  What does it say in the original language?  Be careful
-with definitions. Don't read into it what it doesn't say.</para> </section>
-
-<section id="h2-basics-interpretation-context"><title>Context</title>
-<para>What do the verses around it say?  "Context is king" is the rule -- the passage must make
-sense within the structure of the entire passage and book.</para>
-</section>
-
-<section id="h2-basics-interpretation-cross"><title>Cross-reference</title>
-<para> What do other verses about this subject say through the rest of the Bible?  God
-doesn't contradict Himself, so our interpretation needs to stand the test of other scriptures.</para>
-</section>
-</section>
-
-<section id="h2-basics-expository"><title>An Expository Study
-of Matthew 6:1-18</title>
-<para>Let's study together Mt.6:1-18.  Read it to yourself, first looking for the key verse, the verse that sums
-up the whole passage.  Think you have it?  Test it by picking different places in the passage and asking yourself
-if they relate to the thought of the key verse.  Once you find it, write it as Roman numeral One of your outline:</para>
-<screen>
-I. BEWARE OF PRACTICING YOUR RIGHTEOUSNESS BEFORE MEN TO BE NOTICED
-</screen>
-<para>What does "practicing your righteousness" mean?  Does the passage give any examples?  What area
-of our lives is being addressed?    our motives!      What sub-headings develop this thought?</para>
-<screen>
-  A. WHEN YOU GIVE
-  B. WHEN YOU FAST
-  C. WHEN YOU PRAY
-</screen>
-<para>Now fill in the outline with specific instructions of how to avoid wrong ways of practicing our
-righteousness:</para>
-<screen>
-  A. When you give
-     1. DON'T SOUND A TRUMPET.  (HOW MIGHT SOMEONE "SOUND A TRUMPET" TODAY?)
-     2. DO IT SECRETLY.	ETC.
-</screen>
-</section>
-<section id="h2-basics-worksheet"><title>Worksheet: How to Use a Concordance</title>
-
-<section id="h2-basics-worksheet-select"><title>To Find a Particular Verse</title>
-<orderedlist numeration="arabic">
-<listitem><para>Pick out a key word or most-unusual word of the verse.</para></listitem>
-<listitem><para>Turn to this word alphabetically.</para></listitem>
- <listitem><para>Go down the column of listings until you find your verse.</para></listitem>
-</orderedlist>
-<screen>
-	Find these verses:
-		"Faithful are the wounds of a friend."
-		"We are ambassadors of Christ."
-		The story of the rich man and Lazarus.
-</screen>
-</section>
-
-<section id="h2-basics-worksheet-study"><title>To Do a Topical Study </title>
-<para>Let's say you wanted to do a study of the word "redemption."  First you would look up that word in the
-concordance and look up references listed for it.  Then you could look up related words and references listed for them, e.g.
-"redeem, redeemed, ransom," even "buy" or "bought." </para>
-</section>
-
-
-<section id="h2-basics-worksheet-clarify"><title>To Clarify Word Meanings in the Greek and Hebrew</title>
-<para>What if you noticed a contradiction in the KJV between Mt.7:1 "Judge not lest you be judged" and 1 Cor.2:15
-"He that is spiritual judgeth all things."  Maybe there are two different Greek words here, both being translated "judge" in
-English?  (We're using Strong's from here out.) </para>
-<orderedlist numeration="arabic">
-<listitem><para>Look up "judge."</para></listitem>
-<listitem><para>Go down the column of entries to Mt.7:1.  To the right is a number, 2919.  This refers to the Greek word used.
- Write it down.</para></listitem>
-<listitem><para>Now look up "judgeth."</para></listitem>
-<listitem><para>Go down the column to 1 Cor.2:15 . . . . . 350.</para></listitem>
-<listitem><para>Turn in the back to the Greek dictionary.  (Remember, you're in the NT so the language is Greek, while the
-OT is Hebrew.)  Compare the meaning of 2919 with the meaning of 350 and you have your answer! </para></listitem>
-</orderedlist>
-</section>
-
-<section id="h2-basics-worksheet-names"><title>To Find Meanings of Names</title>
-<para>By the same process we can find the meaning of a name in the Greek or Hebrew.</para>
-<para>Look up these names and write down their meaning:</para>
-<itemizedlist>
-<listitem><para>Nabal </para></listitem>
-<listitem><para>Abigail </para></listitem>
-<listitem><para>Joshua  </para></listitem>
-<listitem><para>Barnabus</para></listitem>
-</itemizedlist>
-
-</section> </section>
-</chapter>
diff --git a/docs/howto/unicode/how2-importance.docbook b/docs/howto/unicode/how2-importance.docbook
deleted file mode 100644
index 0791191..0000000
--- a/docs/howto/unicode/how2-importance.docbook
+++ /dev/null
@@ -1,309 +0,0 @@
-<chapter id="h2-importance"><title>Importance of God's Word</title>
-<para>Understanding God's word is of great importance to all who call on
-God's name.  Study of the Bible is one of the primary ways that we learn to
-communicate with God.</para>
-
-<section id="h2-importance-unique"><title>A Book that is
-Unique</title>
-<para>
-The Bible stands alone in many ways.  It is unique in:
-</para>
-<itemizedlist>
-<listitem>
-<para>
-popularity.  Bible sales in North America:  more than $500 million per
-year.  The Bible is both the the all-time and year-to-year best seller!
-</para>
-</listitem>
-<listitem>
-<para>
-authorship.  It was written over a period of 1600 years by 40 different
-authors from different backgrounds, yet reads as if written by one.
-</para>
-</listitem>
-<listitem>
-<para>
-preservation.  F. F. Bruce in <emphasis>Are New Testament Documents Reliable?</emphasis>
-compares New Testament manuscripts with other ancient texts:
-</para>
-</listitem>
-</itemizedlist>
-<table>
-<title>Comparison of New Testament manuscripts with other ancient texts.</title>
-<tgroup cols="5">
-<thead>
-<row>
-<entry>Work</entry>
-<entry>When Written</entry>
-<entry>Earliest Copy</entry>
-<entry>Time Lapse</entry><entry>Number of Copies</entry>
-</row></thead>
-<tbody>
-<row>
-<entry>Herodotus</entry>
-<entry>448-428 B.C.</entry><entry>900 A.D.</entry>
-<entry>1300 years</entry><entry>8
-</entry></row>
-<row>
-<entry>Tacitus</entry>
-<entry>100 A.D.</entry><entry>1100 A.D.</entry>
-<entry>1000 years</entry><entry>20
-</entry></row>
-<row>
-<entry>Caesar's <emphasis>Gallic War</emphasis></entry>
-<entry>50-58 B.C.</entry><entry>900 A.D.</entry>
-<entry>950 years</entry><entry>10
-</entry></row>
-<row>
-<entry>Livy's <emphasis>Roman History</emphasis></entry>
-<entry>59 B.C. - 17 A.D.</entry><entry>900 A.D.</entry>
-<entry>900 years</entry><entry>20
-</entry></row>
-<row>
-<entry>New Testament</entry>
-<entry>40 A.D. - 100 A.D.</entry><entry>130 A.D. Partial manuscripts 350
-A.D. Full manuscripts</entry> <entry>30 - 310 years</entry><entry>5000 Greek &amp; 10,000 Latin
-</entry></row>
-</tbody></tgroup></table>
-<para>Ten copies of Caesar's <emphasis>Gallic War</emphasis> exist, the earliest of which was copied
-900 years after Caesar wrote the original, etc.  For the New Testament we have
-full manuscripts dating to 350 A. D., papyri containing most of the New
-Testament from the 200s, and a fragment of John's gospel from 130 A. D.  How
-many manuscripts do we have to compare to each other?  5,000 in Greek and 10,000
-in Latin!  </para>
-<blockquote><attribution>Textual critic F. J. A. Hort, "The New Testament in the
-Original Greek", vol. 1 p561, Macmillan Co., quoted in <emphasis>Questions of Life</emphasis> p.
-25-26</attribution><para>"In the verity and fullness of the evidence on which
-it rests, the text of the New Testament stands absolutely and unapproachably
-alone among other ancient prose writings." </para></blockquote>
-
-</section>
-<section id="h2-importance-breathed"><title>A Book that God Breathed</title>
-<para><emphasis>Heb.4:12 </emphasis>"<emphasis>For the word of God is living and active...
-</emphasis>" Jesus said <emphasis>(Mt.4:4),</emphasis>
-"<emphasis>It is written, Man shall not live on bread alone, but on every word that
-proceeds [lit., is proceeding] from the mouth of God.</emphasis>"
-As we read the Bible, God's Spirit is there to speak it to our hearts in a continually-fresh way.
-</para>
-<para>2 Tim.3:16 declares, "<emphasis>All scripture is inspired by God [lit.,
-God-breathed].</emphasis>"  Do you believe this?  Before you answer, consider Jesus' attitude
-toward the Scriptures.  </para>
-<blockquote><attribution>John R.W. Stott, <emphasis>Christ the Controversialist</emphasis>,
-InterVarsity Press 1978, pp.93-95 </attribution><para>He referred to the human authors, but took it for
-granted that behind them all was a single divine Author.  He could equally say
-'Moses said' or 'God said' (Mk.7:10). He could quote a comment of the narrator in
-Genesis 2:24 as an utterance of the Creator Himself (Mt.19:4-5).  Similarly He
-said, 'Well did Isaiah prophesy of you hypocrites, as it is written', when what He
-went on to quote is the direct speech of the Lord God (Mk.7:6 &amp; Is.29:13).  It
-is from Jesus Himself that the New Testament authors have gained their
-conviction of the dual authorship of Scripture.  For them it was just as true to
-say that 'God spoke of old to our fathers by the prophets' (Heb.1:1) as it was to
-say that 'men moved by the Holy Spirit spoke from God' (2 Pe.1:21).  God did not
-speak in such a way as to obliterate the personality of the human authors, nor
-did men speak in such a way as to corrupt the Word of the divine Author.  God
-spoke.  Men spoke.  Neither truth must be allowed to detract from the other. ...
-</para>
-<para>
-This, then, was Christ's view of the Scriptures.  Their witness was God's
-witness. The testimony of the Bible is the testimony of God.  And the chief
-reason why the Christian believes in the divine origin of the Bible is that
-Jesus Christ Himself taught it.  </para></blockquote>
-
-<para>2 Tim.3:16 goes on, "<emphasis>and profitable for teaching, for
-correction, for training in righteousness, that the man of God may be adequate,
-equipped for every good work.</emphasis>"  If we accept that the Bible really is God
-speaking to us, it follows that it will be our authority in all matters of faith
-and conduct. </para>
-</section>
-<section id="h2-importance-works"><title>A Book that Works</title>
-<para>
-What will studying the Bible do for you?  1 Thess.2:13 says that the Bible
-"<emphasis>performs its work in you
-who believe.</emphasis>"  Beside each scripture, write down the work the Word
-performs.
-</para>
-<table>
-<title>What does Bible study do for Christians?</title>
-<tgroup cols="2">
-<thead>
-<row>
-<entry>Reference</entry>
-<entry>Action</entry>
-</row>
-</thead>
-<tbody>
-<row>
-<entry>Eph. 5:26
-</entry>
-<entry>cleanses -- "...having cleansed her by the washing of water with the word."
-</entry>
-</row>
-<row>
-<entry>
-Acts 20:32
-</entry>
-<entry>
-builds up --
-"
-...the word of His grace, which is able to build you up and to give you the
-inheritance among all those who are sanctified.
-"
-</entry>
-</row>
-<row>
-<entry>
-Rom. 15:4
-</entry>
-<entry>
-encourages -- "that through perseverance and the
-encouragement of the Scriptures we might have hope."
-</entry>
-</row>
-
-<row>
-<entry>
-Rom. 10:17
-</entry>
-<entry>
-gives faith --
-"So faith comes from hearing, and hearing by the word of
-Christ."
-</entry>
-</row>
-
-<row>
-<entry>
-1 Cor. 10:11
-</entry>
-<entry>
-instructs --
-"Now these things happened to them for an example,
-and they were written for our instruction"
-</entry>
-</row>
-
-<row>
-<entry>
-Mt. 4:4
-</entry>
-<entry>
-nourishment --
-"But He answered and said, 'It is written, Man shall not live on bread alone,
-but on every word that proceeds out of the
-mouth of God.'"
-</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-</section>
-<section id="h2-importance-liberates"><title>A Book that Liberates</title>
-<para>
-Jn.8:32 "<emphasis>and you shall know the truth, and the truth shall make you
-free.</emphasis>"This is usually quoted by
-itself.  Is this a conditional or unconditional promise?  Would it apply to
-all kinds of knowledge?  Find the answers by examining the first half of the
-sentence, in v.31. "<emphasis>If you abide in My word, then you are truly disciples of
-Mine... </emphasis>"</para>
-<para>We see that this is a conditional promice, specifically speaking of the truth of God's word.</para>
-
-<para>The Greek word for "wind" used in Eph.4:14 means a <emphasis>violent wind.</emphasis>
-"<emphasis>As a result, we are no longer to be children, tossed here and there by
-waves, and carried about by every wind of doctrine...</emphasis>"One
-thing studying the Bible does for us is to ground us in the truth, with the
-result that we won't be easily "blown away."</para>
-
-<para><emphasis>But Jesus answered and said to them, </emphasis>"<emphasis>You are mistaken [KJV Ye do err], not
-understanding the Scriptures, or the power of God.</emphasis>"Mt.22:29</para>
-<para>What 2 things do we need to know to be kept from error?</para>
-<itemizedlist>
-<listitem><para>God's word</para></listitem>
-<listitem><para>God's power </para></listitem>
-</itemizedlist>
-</section>
-<section id="h2-importance-wars"><title>A Book that Wars</title>
-<para>
-Eph.6:10-18 is one picture of our spiritual armament.</para>
-<table>
-<title>Spiritual Armor</title>
-<tgroup cols="2">
-<thead>
-<row>
-<entry>Question</entry>
-<entry>Answer</entry>
-</row></thead>
-<tbody>
-<row><entry>How many of the weapons listed here are defensive weapons?</entry><entry>5</entry></row>
-<row><entry>How many are offensive?</entry><entry>One</entry></row>
-<row><entry>Which one(s)? </entry><entry>the word - <foreignphrase>rhema</foreignphrase></entry></row>
-</tbody></tgroup></table>
-</section>
-<section id="h2-importance-exhortations"><title>Exhortations</title>
-<para>
-2 Tim.2:15 (KJV) "<emphasis>Study to show thyself approved unto God, a workman that needeth not to be ashamed, rightly
-dividing the word of truth.</emphasis>"
-</para>
-<para>
-Col.3:16 "<emphasis>Let the word of Christ richly dwell within you; with all wisdom teaching and admonishing one another
-with psalms and hymns and spiritual songs, singing with thankfulness in your hearts to God.</emphasis>"
-</para>
-
-<para>If you're rich in something, how much of it do you
-have? </para>
-<para>
-Not a little!</para>
-
-<para>
-Eccl.12:11 "<emphasis>The words of wise men are like goads, and masters of these
-collections are like well-driven nails; they are given by one Shepherd.  But
-beyond this, my son, be warned:  the writing of many books is endless, and
-excessive devotion to books is wearying to the body.</emphasis>"
-</para> </section>
-
-<section id="h2-importance-once"><title>Appendix: "Once for
-All"</title>
-<blockquote>
-<attribution>John R. W. Stott, <emphasis>Christ the Controversialist,</emphasis>
-InterVarsity Press 1978, pp.106-107</attribution> <para>The truth regarding the
-finality of God's initiative in Christ is conveyed by one word of the Greek
-Testament, namely the adverb <foreignphrase>hapax</foreignphrase> and
-<foreignphrase>ephapax</foreignphrase>. It is usually translated in the
-Authorized Version once, meaning once for all. It is used of what is so done as
-to be of perpetual validity and never need repetition, and is applied in the NT
-to both revelation and redemption.  Thus, Jude refers to the faith which was
-once for all delivered to the saints (Jude 3), and Romans says,
-"<emphasis>Christ also died for sins once for all</emphasis>"
-(Rom.6:10, see also 1 Pe.3:18; Heb.9:26-28). </para> <para>
-Thus we may say that God has spoken once
-for all and Christ has suffered once for all.  This means that the Christian
-revelation and the Christian redemption are both alike in Christ complete.
-Nothing can be added to either without being derogatory to Christ...  These are
-the two rocks on which the Protestant Reformation was built -- Gods revealed
-word without the addition of human traditions and Christ's finished work without
-the addition of human merits.  The Reformers great watchwords were <foreignphrase>sola
-scriptura</foreignphrase> for our authority and <foreignphrase>sola gratia</foreignphrase> for our salvation.</para>
-</blockquote>
-
-</section>
-<section id="h2-importance-supplement"><title>Supplement: Bible Reading
-Programs</title> <para> Here are some easy programs to systematically read your
-Bible.  You can do more than one at a time if you like, for instance #1 with #4,
-or #2 with #5.  Vary the program from year to year to keep it fresh!
-</para>
-<orderedlist numeration="arabic">
-<listitem><para>New Testament in a Year: read one chapter each day, 5 days a
-week.</para></listitem>
-<listitem><para>Proverbs in a Month: read one chapter of Proverbs each day,
-corresponding to the day of the month.</para></listitem>
-<listitem><para>Psalms in a Month: read 5 Psalms at intervals of 30 each day,
-for instance on the 20th you read Ps.20, 50, 80, 110, &amp; 140.</para></listitem>
-<listitem><para>Psalms &amp; Proverbs in 6 months: read through Psalms and Proverbs
-one chapter per day.</para></listitem>
-<listitem><para>Old Testament without Psalms &amp; Proverbs in 2 years: if
-you read one chapter a day of the Old Testament, skipping over Psalms &amp; Proverbs, you will read the Old Testament in 2 years and 2 weeks.
-</para></listitem>
-</orderedlist>
-</section>
-</chapter>
-
diff --git a/docs/howto/unicode/how2-interpretation.docbook b/docs/howto/unicode/how2-interpretation.docbook
deleted file mode 100644
index b382249..0000000
--- a/docs/howto/unicode/how2-interpretation.docbook
+++ /dev/null
@@ -1,198 +0,0 @@
-<chapter id="h2-rules"><title>Rules of Bible Interpretation (Hermeneutics)</title>
-<para>We already learned about the "3 Cs": content, context, cross-reference.  We want to expand that now by
-delving briefly into biblical hermeneutics, whose goal is to discover the meaning intended by the original author (and
-Author!).  While many applications of a passage are valid, only one interpretation is valid.  The scripture itself says
-this by saying that no scripture is of any private interpretation (2 Pe.1:20 KJV <emphasis>"Knowing this first, that no
-prophesy of scripture is of any private interpretation."</emphasis>)  Certain rules are helps toward discovering the correct meaning;
-by ignoring these rules people have brought much trouble on themselves and their followers.  2 Pe.3:16 <emphasis>"...in which are
-some things hard to understand, which the untaught and unstable distort, as they do also the rest of the Scriptures, to
-their own destruction."</emphasis></para>
-<para>How do we go about discovering the intended meaning of a passage?  Let's say your attention has been
-drawn to a particular verse whose meaning is not clear to you.  How do you study it out?  Keep these rules in mind:</para>
-
-<section id="h2-rules-exact"><title>Rule 1 - Interpret according to the exact
-meaning of the words.</title>
-<para>The more precise we can be with the exact, original meaning of the words the better our interpretation will be.
-Try to find the exact meaning of the key words by following these steps:</para>
-
-<section id="h2-rules-exact-definition"><title>Step 1) Definition</title>
-<para>Look up the definition in a Greek or Hebrew dictionary.  For verbs, the verb tense is also
-crucial.</para></section>
-
-<section id="h2-rules-exact-crossref"><title>Step 2) Cross-reference</title>
-<para>Compare scripture with scripture.  Seeing how the same Greek or Hebrew word
-(not the English word) is used in scripture may clarify or throw new light on the definition.  How does the same author
-use this word elsewhere?  Other authors?  Your reference tools may give you uses of the word in non-biblical
-documents, as well.  Why do we have to go to the original languages; why isn't the English word good enough?
-BECAUSE MORE THAN ONE GREEK WORD MAY BE TRANSLATED INTO THE SAME ENGLISH WORD, AND THE GREEK
-WORDS MAY HAVE DIFFERENT SHADES OF MEANING.</para>
-
-<section id="h2-rules-exact-crossref-ex1a"><title>Example 1A</title>
-<para>Jn.20:17 <emphasis>"Touch me not"</emphasis> (KJV) sounds harsh, doesn't it?  Sounds like Jesus doesn't want
-to be touched now that He is risen, that He is too holy or something.  But that doesn't seem right, so let's look
-it up in Spiros Zodhiates' <emphasis>The Complete Word Study New Testament</emphasis> (AMG Publishers, 1991).</para>
-<para>Definition:  Turning to John 20:17, above the word "Touch" we see "pim680."  The letters
-give us a code for the part of speech, and the number refers to Strong's dictionary reference.  Let's look up
-the definition  (p. 879).  "680.  Haptomai; from hapto (681), touch.  Refers to such handling of an object as to exert a modifying
-influence upon it... Distinguished from pselaphao (5584), which actually only means to touch the surface of something. "   Now look
-up "pim."  The grammar codes in Zodhiates come right after Revelation; on p. 849 we see that pim stands for
-"present imperative active (80)".  On p.857, "Present Imperative.  In the active voice, it may indicate a command to do
-something in the future which involves continuous or repeated action or, when it is negated, a command to stop doing something. " This
-is a negative command, so it is to stop doing something that is already occuring.  So, what have we found?</para>
-<para><emphasis>MARY IS ALREADY CLINGING TO JESUS, AND HE IS SAYING TO STOP HOLDING HIM!</emphasis></para>
-</section>
-
-<section id="h2-rules-exact-crossref-ex1b"><title>Ex. 1B</title>
-<para>In James 5:14, <emphasis>Elders are told to pray and anoint someone who is sick</emphasis>.  What is this anointing?</para>
-<para>Definition of aleipho (218) - "to oil" (Strong's); but we also have another Greek word translated
-"anoint", chrio (5548) - "to smear or rub with oil, i.e. to consecrate to an office or religious service" (Strong's).
- Since it's a verb, consider the tense also, "apta" aorist participle active.  "The aorist participle expresses simple action,
-as opposed to continuous action...When its relaitonship to the main verb is temporal, it usually signifies action prior to that of the main
-verb." (Zodhiates p.851)</para>
-
-<screen>
-Cross-references for aleipho:
-  Mt.6:17 But you, when you fast, anoint your head
-  Mk.16:1 [the women] brought spices that they might come and anoint Him.
-  Mk.6:13 And they were...anointing with oil many sick people and healing them.
-  Lk.7:38 ...kissing His feet and anointing them with the perfume
-  Jn.12:3 Mary...anointed the feet of Jesus, and wiped them with her hair
-Cross-references of chrio:
-  Lk.4:18 The Spirit of the Lord is upon me, because He has anointed me to preach..."
-  Acts 4:27 Jesus, whom Thou hast anointed
-  Acts 10:38 God anointed Jesus with the Holy Ghost and power
-  2 Cor.1:21 Now He who...anointed us is God
-</screen>
-
-<para>So what's the difference between aleipho and chrio?  Look back over the cross-references and the
-definitions, and sum up the difference:   ALEIPHO IS A PRACTICAL USE OF OIL AND CHRIO IS A SPIRITUAL </para>
-
-<para>As an illustration (although the word is not used) of the practical use of oil at that time, when the good
-Samaritan cared for the man beat up by robbers he poured oil and wine in the wound.  So oil had a medicinal
-use in Jesus' day.
-</para>
-<para>Now let's apply what we just learned by this word study to James 5:14  <emphasis>"Is any among you sick?  Let
-him call for the elders of the church; and let them pray over him, anointing him with oil in the name of the
-Lord."</emphasis>  Is "anointing" spiritual or practical?   Practical!</para>
-<para>
-And the tense in Greek, the aorist participle, would
-be better translated "having anointed," so the order is the anointing first, then the prayer ("in the name of the
-Lord"refers to the prayer, not the anointing).  James 5 is saying that the elders should give the sick person
-medicine and pray for him in the name of the Lord.  Doesn't that express a beautiful balance of practical and
-spiritual in our God!
-</para>
-</section>
-</section>
-</section>
-
-<section id="h2-rules-context">
-<title>Rule 2 - Interpret within the biblical
-context</title>
-<para>Interpret scripture in harmony with other scripture.  What do the
-verses on each side say?  What is the theme of the chapter?  the book?  Does your interpretation fit with these?  If not,
-it is flawed.  Usually, the context supplies what we need to correctly interpret the passage.  Context is key.  If
-confusion remains as to the meaning after we have interpreted the text within its context, we have to look further.</para>
-
-<section id="h2-rules-context-ex2a"><title>Example 2A</title>
-<para>In a previous lesson we considered Jn.3:5 <emphasis>"born of water and the Spirit."</emphasis>  In context, what is
-the water under discussion here?</para>
-<para>Water baptism is not under discussion here, which would be a big switch from the subject being
-discussed by Jesus and Nicodemus.  Watch out for a sudden change of topic, it may be a clue that your
-interpretation has been derailed!  The water is the amniotic fluid, "born of water" = natural birth.</para>
-</section>
-<section id="h2-rules-context-ex2b"><title>Example 2B</title>
-<para>1 Cor.14:34  <emphasis>"Let the women keep silent in the churches"</emphasis>  has to be taken within the biblical
-context of 1 Cor.11:5 <emphasis>"every woman...while praying or prophesying..."</emphasis></para>
-</section>
-<section id="h2-rules-context-ex2c"><title>Example 2C</title>
-<para>Acts 2:38 <emphasis>And Peter said to them, "Repent,
-and let each of you be baptized in the name of
-Jesus Christ for the forgiveness of your sins..."</emphasis>  Is this teaching baptismal regeneration?  	If this was the
-only verse of scripture we had, we would have to conclude that.  But in the light of the clear teaching
-elsewhere that regeneration happens by faith in Christ, we have to interpret it otherwise.  Peter is urging
-baptism as a way for his hearers to respond to the gospel.  If baptism were the pathway to being born again,
-how could Paul write 1 Cor.1:17 <emphasis>"For Christ did not send me to baptize, but to preach the gospel"</emphasis>?
-</para>
-</section>
-</section>
-
-<section id="h2-rules-hcontest">
-<title>Rule 3 - Interpret within the historical and
-cultural context</title>
-<para>
-At first we are not asking  "What does it mean to
-me?" but "What did it mean to the original readers?"; later we can ask, "What does it mean to me?"  We have to take
-into account the historical and cultural background of the author and the recipients.</para>
-
-<section id="h2-rules-hcontest-ex3a"><title>Example 3A</title><para>  "3 days &amp; 3 nights" (Mt.12:40) have
-led some to come up with a "Wednesday crucifixion
-theory," esp. the cult of Armstrongism.  How could Jesus die on Friday afternoon and rise Sunday morning
-yet "be raised on the third day" (Mt.16:21)?  Exact meanings of "three" or "days" won't help explain the
-apparent contradiction.</para>
-<para>We need an historical tidbit: Jews counted any part of a day as a full day, as we would count buckets
-of water (if there were six and one-half buckets of water, we would say there were 7 buckets of water even if one was only partly full).  So to the Jewish
-mind, any part of a day counted as a full day, and days started at 6 p.m. and ended at 6 a.m.  Friday from 3
-p.m. to 6 p.m. = day 1.  Friday 6 p.m. to Saturday 6 p.m. = day 2.  Saturday 6 p.m. to Sunday 5 or so a.m. =
-day 3.  Interpreting within the cultural context keeps us out of trouble.</para>
-</section>
-
-<section id="h2-rules-hcontest-ex3b"><title>Example 3B</title><para>Gen.15:7-21.  The historical context
-is that cutting animals in two and then walking between
-the pieces was the normal way of entering a contract in Abraham's day.  Both parties walked between, taking
-the pledge that dismemberment would happen to them if they didn't live up to their part of the contract.  But
-in this case only God goes thru, making it a unilateral covenant.</para>
-</section>
-</section>
-
-<section id="h2-rules-normal"><title>Rule 4 - Interpret according to the normal
-usage of words in language</title>
-<para>Let literal language be literal and
-figurative language be figurative.  And watch out for idioms, which have special meanings.</para>
-
-<section id="h2-rules-normal-ex4a"><title>Example 4A</title><para>"evil eye" in Mt.6:23. </para>
-<para>Rule 1, definition of "evil" and "eye" - no help here.  Rule 2, context:  seems to confuse us even
-more.  It doesn't seem to fit with what goes before and after!  This should tip us off that we aren't
-understanding it rightly!!</para>
-<para>What we have here is a Hebrew idiom, "evil eye."  Let's look up other uses of this idiom: Mt.20:15
-"<emphasis>Is it not lawful for me to do what I wish with what is my own?  Or is your eye envious [lit."evil"] because I
-am generous [lit."good"]?</emphasis>"  We find that having an "evil eye" is a Hebrew idiom for being stingy or envious.
-Now go back to Mt.6 and notice how this understanding ties in so perfectly to the context.</para>
-
-<section id="h2-rules-normal-ex4b"><title>Example 4B</title>
-<para>Is.59:1 "<emphasis>The Lord's hand is not short;</emphasis>" Deut.33:27 "<emphasis>Underneath are the everlasting arms.</emphasis>"
-References to body parts of God are used by Latter-Day Saints to prove that God was once a man just as we
-are.  Once they convince people of that, they go on to teach that we can become God just like He is!  At a
-lecture he was giving, a group of Mormon elders challenged Walter Martin (author of <emphasis>Kingdom of the Cults</emphasis>)
-with an enumeration of verses like these.  Dr. Martin then asked the Mormons to read one more scripture:
-Ps.91:4 "<emphasis>He will cover you with His feathers; And under His wings shalt thou trust.</emphasis>"  W.M. said, "By the same
-rules of interpretation that you just proved God to be a man, you just proved that He is a bird."  The Mormons
-had to laugh as they realised the ridiculousness of their position.
-</para>
-</section>
-</section>
-</section>
-<section id="h2-rules-parables"><title>Rule 5 - Understand the purpose of
-parables and the difference between a parable and an allegory</title>
-<para>An allegory is:  A STORY WHERE EACH ELEMENT HAS A MEANING </para>
-<para>Every parable is an allegory, true or false?</para>
-
-<para>Some parables are allegories, for instance, the parable of the sower is an allegory:  the seed is the word of
-God, the thorns are worries and greed, etc.  But most parables are not allegories but simply stories to illustrate one
-point.    It's dangerous to get our doctrine from parables; they can be twisted to say all sorts of things.  We need to get
-our doctrine from clear scriptures that lay it out; then if a parable illustrates that, fine.</para>
-
-<section id="h2-rules-parables-ex5a"><title>Example 5A</title>
-<para>The parable of the widow with the unrighteous judge in Lk.18:1-8.  This story illustrates one
-lesson:  boldness in prayer.  If we draw it into an allegory, what do we have?</para>
-<para>All sorts of violence happens to the meanings: God is reluctant to protect the rights of widows, prayer
-"bothers" Him, etc.</para></section>
-
-<section id="h2-rules-parables-ex5b"><title>Example 5B</title>
-<para>The parable of the unrighteous steward in Lk.16:1-9.   What is the point of the parable?  Is it
-an allegory? </para>
-<para>The steward is commended for only one thing, his shrewdness in using what he had to prepare for a
-time when he wouldn't have it.  But he is not commended for his unethical behavior in cheating his master. </para>
-</section>
-
-</section>
-</chapter>
diff --git a/docs/howto/unicode/index.docbook b/docs/howto/unicode/index.docbook
deleted file mode 100644
index 3728a56..0000000
--- a/docs/howto/unicode/index.docbook
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
-  <!ENTITY bibletime '<application>BibleTime</application>'>
-  <!ENTITY kapp "&bibletimehandbook;">
-  <!ENTITY % addindex "IGNORE">
-  <!ENTITY % English "INCLUDE"><!-- change language only here -->
-
-  <!-- user entities -->
-
-  <!ENTITY how2-chap1 SYSTEM "how2-importance.docbook">
-  <!ENTITY how2-chap2 SYSTEM "how2-basics.docbook">
-  <!ENTITY how2-chap3 SYSTEM "how2-interpretation.docbook">
-
-]>
-
-<book lang="&language;">
-
-<bookinfo>
-<title>The Biblestudy HowTo</title>
-
-<authorgroup>
-<author>
-<firstname>Bob</firstname>
-<surname>Harman</surname>
-</author>
-</authorgroup>
-
-<!-- TRANS:ROLES_OF_TRANSLATORS -->
-
-<copyright>
-<year>2001</year><year>2002</year><year>2003</year>
-<holder>The team of &bibletime;, info@bibletime.info</holder>
-</copyright><copyright>
-<year>2001</year><year>2002</year><year>2003</year>
-<holder>Bob Harman</holder>
-</copyright>
-
-<legalnotice><para>
-The copyright of this text is held by the author Bob Harman.  The text was adapted for
-publication with BibleTime by Fred Saalbach.</para>
-
-<para> Non exclusive serial rights for this distribution of
-this document with the &bibletime; Software have been made. Redistribution as part
-of the Bibletime software without modification and limited reproduction
-as provided by the "fair use" provisions of the US copyright code are
-also permitted.</para>
-
-<para> For questions regarding the use of this
-material contact Bob Harman c/o New Covenant Church 1079 Big Bethel Rd. Hampton
-VA 23666 USA <email>ncc@ncchampton.org</email>.</para>
-
-<para>Scripture quotes are from the New American Standard Bible unless otherwise indicated</para>
-</legalnotice>
-
-
-<date>10/23/2001</date>
-<releaseinfo>1.01.00</releaseinfo>
-
-
-<abstract>
-<title>Abstract</title>
-<para>
-The <application>Biblestudy HowTo</application> is a guide for studying the Bible.
-</para>
-<para>It is the hope of the &bibletime; team that this HowTo will provoke the
-readers to study the scriptures to see what they say.  This
-particular study guide has been chosen as it takes care not to
-advocate any particular denominational doctrine.  We expect you to read
-and study the scriptures to understand what they say.  If you start
-with the attitude that you want to have the Lord sow his word in your
-heart He will not disappoint you.</para>
-</abstract>
-
-<keywordset>
-<keyword>Bible</keyword>
-<keyword>Study</keyword>
-<keyword>HowTo</keyword>
-</keywordset>
-
-</bookinfo>
-
-&how2-chap1;
-&how2-chap2;
-&how2-chap3;
-
-</book>
-<!--
-Local Variables:
-mode: sgml
-sgml-minimize-attributes:nil
-sgml-general-insert-case:lower
-sgml-indent-step:0
-sgml-indent-data:nil
-End:
--->
\ No newline at end of file
diff --git a/docs/ksgmltools-bug-read-me.txt b/docs/ksgmltools-bug-read-me.txt
deleted file mode 100644
index 5a40a7f..0000000
--- a/docs/ksgmltools-bug-read-me.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-During the creation of these documents I found several problems with the
-docbook DTD supplied with Mandrake 8.1  This read me documents the work arounds made.
-
-Problem
-
-&XML; parses as XML?
-
-Solution
-
-Edited the file  /usr/share/apps/ksgmltools2/customization/entities/general.entities
-also known as "-//KDE//ENTITIES DocBook XML General Entity Declarations V1.0//EN"
-
-to read
-<!ENTITY XML		'<trademark class="registered">XML</trademark>'>
-
-Also did this with all trademark tags that had no class.  Class is required for this tag, see
-
-DocBook: The Definitive Guide
-By Norman Walsh and Leonard Muellner
-O'Reilly & Associates, Inc.
-
-Result
-
-&XML; parses as XML®
-
-
-Problem
-<quote>stuff</quote> parses as ?quote?
-
-Used " instead.
-
-This should be corrected when <quote> parses as "
-
-----------------------
-Fred Saalbach 22 Dec 2001
-----------------------
diff --git a/docs/tips b/docs/tips
deleted file mode 100644
index c8bda33..0000000
--- a/docs/tips
+++ /dev/null
@@ -1,165 +0,0 @@
-<tip category="BibleTime|General">
-<html>
-The Bible was written so we could believe in Jesus. (John 20:31)
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-BibleTime includes a really useful handbook written by Fred Saalbach.
-To read it choose the item "Handbook" in the "Help" menu of BibleTime.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-No one is allowed by God to add anything to or take anything away from the Word. (Revelation 22:18-19)
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-The Bible is like a mirror. (James 1:23)
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-BibleTime does include a <B>Bible Study HowTo</B>!
-It was written by Bob Harman and is a great introduction how to study the Bible.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-You can save, print and copy the whole search result by pressing the right mouse button on the icon of the searched module in the search dialog.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-The Bible is our only spiritual weapon. (Ephesians 6:17)
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-To get the number of verses in the Bible search for a space in the module.
-The search analysis shows you the number of verses of each book.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-The Bible is truth. (John 17:17)
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-If you would like to create a set of bookmarks around a specific topic with comments containing what the Lord told you here, it's best to
-make bookmarks from your personal commentary.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-The scriptures give us the wisdom that leads to salvation. (2 Timothy 3:15)
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-To lookup the meaning of the original hebrew or greek word in a Bible supporting Strong's numbers, switch them on and 
-click on the strong number. Now a new window showing the strong number with
-it's explanation is shown. If your favourite translation doesn't support Strong's numbers please refer to an alternate translation for the number of the corresponding word.
-Make sure you have set the default modules in the preferences.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-If you want to use a commentary as a topical reference, search it for terms your topic is about.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-In the beginning was the Word, the Word was with God, and the Word was God. (John 1:1)
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-We will be judged on the last day by the words Jesus spoke. (John 12:48)
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-If you want to find the full set of verses or entries on a area of content, you should use the option "Multiple words (OR)" for searching.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-If you are searching a verse you know only fuzzy or in a different translation search for the most probable terms in multiple Bible translations at the same time.
-</html></tip>
-
-<tip category="BibleTime|General">
-<html>
-God's Word can be a lamp to your feet and a light to your path. (Psalm 119:105)
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-If you want to search a word in a foreign module (e.g. greek or hebrew), open a display window and choose a chapter or an entry which contains this word.
-Select it and copy it to the clipboard. Now insert the copied word in the search text box of the searchdialog.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-The Word of God will not return to Him without accomplishing its purpose. (Isaiah 55:11)
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-Foreign modules do often require a special font to display correctly. You can set the font for each language in the preferences.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-Did you know that the first book ever printed on a printing press was the Bible (by Johann Gutenberg, in 1492)?
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-God has already given to us everything pertaining to life and godliness. (2 Peter 1:3)
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-All important elements of BibleTime's graphical user interface have a tooltip and a "What's this?" help.<BR>
-To read the "What's this?" help press the keys SHIFT+F1 and click on the part.
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-The Word of God is living, active, and sharper than any two-edged sword. (Hebrews 4:12)
-</html>
-</tip>
-
-<tip category="BibleTime|General">
-<html>
-You are using a program that has been written for the glory of God.<BR>May He bless you as you study His Word!
-</html>
-</tip>
-
-
diff --git a/packaging-howto.txt b/packaging-howto.txt
deleted file mode 100644
index 8b966aa..0000000
--- a/packaging-howto.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-This is a small explanation how to create packages of BibleTime
----------------------------------------------------------------
-
--Source packages of BibleTime:
-------------------------------
-	To build source packages like bibletime-1.1.tar.gz execute these
-commands and procedures:
-	1. Change in configure.in.in the version number to the right one. Check README.in and INSTALL.in if
-	the requirements and heir version numbers changed.	
-	2. "make -f Makefile.cvs && ./configure && make distclean && rm
-bibletime-*.tar*" to cleanup the source directory
-	3. "make dist" to create the package bibletime-1.1.tar.gz
-	4. "gunzip bibletime-1.1.tar.gz && bzip2 bibletime-1.1.tar" to
-create the source archive packed with bzip2, the source package is now
-called "bibletime-1.1.tar.bz2"
-	5. Test the package. Execute "bzcat bibletime-1.1.tar.bz | tar -xf -"
-somewhere, then "cd bibletime-1.1" and then "./configure && make && make
-install". Start BibleTime to test if the installation had success and if all
-icons etc. are there.
-	6. Upload the bibletime-1.1.tar.bz2 file.
-
--Binary RPM of BibleTime
-------------------------
-	1. Locate where your RPM base directory is. On SuSE this is
-/usr/src/packages. We continue with this dir.
-	2. "cp bibletime-1.1.tar.bz2 /usr/src/packages/SOURCES/"
-	3. "cp bibletime/bibletime.spec /usr/src/packages/SPECS/"
-	4. "cd /usr/src/packages/"
-	5. "rpm -ba SPECS/bibletime.spec". If this works you're on the good
-side, otherwise it's not so good ;) Before you exec the rpm command make
-sure you have a standard configuration, for example special graphic card
-drivers will lead to wrong dependencies (e.g. NVidia drivers). Deinstall
-them first if there are some, then build and then reinstall them.
-	6. Test the binary RPM. The binary package is normally located in
-/usr/src/packages/RPMS/<arch>/, source RPMs are in /usr/src/packages/SRPMS/.
-Often <arch> is "i586". Try to install the binary package by "rpm -U
-bibletime-1.1-1.rpm" and check dependencies by executing "rpm -q --requires
-bibletime".
-	7. Rename the RPM to have the right name, including the distribution
-it was built on, e.g. "bibletime-1.1-1.i586.rpm" should be renamed to
-"bibletime-1.1-suse7.3-1.i586.rpm" so users know on which distribution the
-packages was built.
-	8. Release the binary and source package. The source package should
-have it's original name because it's distribution independant.
\ No newline at end of file
diff --git a/pot/Makefile.am b/pot/Makefile.am
deleted file mode 100644
index 40fcb2d..0000000
--- a/pot/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-# make messages.pot
-# the -x is for skipping messages already translated in kdelibs
-
-messages:
-	echo Preparing documentation files handbook.pot and howto.pot...
-	mkdir -p tmp/
-	for XML_FILE in `cd ..; find docs -name "*.docbook"`; do\
-		echo " creating temporary POT file tmp/$$XML_FILE.pot";\
-		(cd tmp; mkdir -p `dirname $$XML_FILE.pot`; xml2pot ../../$$XML_FILE > $$XML_FILE.pot;)\
-	done
-	echo merging POT files...
-	msgcat --force-po -o handbook.pot `find tmp/docs/handbook -name "*.pot"`
-	msgcat --force-po -o howto.pot `find tmp/docs/howto/ -name "*.pot"`
-	rm -r ./tmp/
-	echo Finished creating handbook.pot and howto.pot.
-	\
-	echo Preparing program messages file messages.pot...
-	perl ./extractrc ../bibletime/xml/*.rc > ../bibletime/rc-dummy.cpp
-	perl ./preparetips ../docs/tips > ../bibletime/tips-dummy.cpp
-	$(XGETTEXT) -C -F -L C++ -ki18n -kI18N_NOOP -x `kde-config --prefix`/include/kde.pot `find .. -type f -not -name clanguagemgr.cpp -and -name \*.cpp -or -name \*.h -or -name \*.cc` -o messages.pot
-	recode iso8859-1..utf-8 messages.pot
-	cp ../bibletime/backend/clanguagemgr.cpp clanguagemgr.cpp
-	$(XGETTEXT) --from-code=utf-8 --join-existing -C -F -L C++ -ki18n -kI18N_NOOP -x `kde-config --prefix`/include/kde.pot clanguagemgr.cpp -o messages.pot
-	rm clanguagemgr.cpp
-	echo Finished creating messages.pot.
-
-
-
diff --git a/pot/Makefile.in b/pot/Makefile.in
deleted file mode 100644
index e13c0f6..0000000
--- a/pot/Makefile.in
+++ /dev/null
@@ -1,519 +0,0 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
-# KDE tags expanded automatically by am_edit - $Revision: 1.22 $ 
-# @configure_input@
-
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# make messages.pot
-# the -x is for skipping messages already translated in kdelibs
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-ARTSCCONFIG = @ARTSCCONFIG@
-AUTOCONF = @AUTOCONF@
-AUTODIRS = @AUTODIRS@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BT_LDFLAGS = @BT_LDFLAGS@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_FILES = @CONF_FILES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DCOPIDL = @DCOPIDL@
-DCOPIDL2CPP = @DCOPIDL2CPP@
-DCOPIDLNG = @DCOPIDLNG@
-DCOP_DEPENDENCIES = @DCOP_DEPENDENCIES@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DISTRIBUTION = @DISTRIBUTION@
-DISTRIBUTION_VERSION = @DISTRIBUTION_VERSION@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
-GMSGFMT = @GMSGFMT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KCFG_DEPENDENCIES = @KCFG_DEPENDENCIES@
-KCONFIG_COMPILER = @KCONFIG_COMPILER@
-KDECONFIG = @KDECONFIG@
-KDE_EXTRA_RPATH = @KDE_EXTRA_RPATH@
-KDE_INCLUDES = @KDE_INCLUDES@
-KDE_LDFLAGS = @KDE_LDFLAGS@
-KDE_MT_LDFLAGS = @KDE_MT_LDFLAGS@
-KDE_MT_LIBS = @KDE_MT_LIBS@
-KDE_NO_UNDEFINED = @KDE_NO_UNDEFINED@
-KDE_PLUGIN = @KDE_PLUGIN@
-KDE_RPATH = @KDE_RPATH@
-KDE_USE_CLOSURE_FALSE = @KDE_USE_CLOSURE_FALSE@
-KDE_USE_CLOSURE_TRUE = @KDE_USE_CLOSURE_TRUE@
-KDE_USE_FINAL_FALSE = @KDE_USE_FINAL_FALSE@
-KDE_USE_FINAL_TRUE = @KDE_USE_FINAL_TRUE@
-KDE_USE_NMCHECK_FALSE = @KDE_USE_NMCHECK_FALSE@
-KDE_USE_NMCHECK_TRUE = @KDE_USE_NMCHECK_TRUE@
-KDE_XSL_STYLESHEET = @KDE_XSL_STYLESHEET@
-LDFLAGS = @LDFLAGS@
-LIBCOMPAT = @LIBCOMPAT@
-LIBCRYPT = @LIBCRYPT@
-LIBDL = @LIBDL@
-LIBJPEG = @LIBJPEG@
-LIBOBJS = @LIBOBJS@
-LIBPNG = @LIBPNG@
-LIBPTHREAD = @LIBPTHREAD@
-LIBRESOLV = @LIBRESOLV@
-LIBS = @LIBS@
-LIBSM = @LIBSM@
-LIBSOCKET = @LIBSOCKET@
-LIBTOOL = @LIBTOOL@
-LIBUCB = @LIBUCB@
-LIBUTIL = @LIBUTIL@
-LIBZ = @LIBZ@
-LIB_KAB = @LIB_KAB@
-LIB_KABC = @LIB_KABC@
-LIB_KDECORE = @LIB_KDECORE@
-LIB_KDEPIM = @LIB_KDEPIM@
-LIB_KDEPRINT = @LIB_KDEPRINT@
-LIB_KDEUI = @LIB_KDEUI@
-LIB_KFILE = @LIB_KFILE@
-LIB_KFM = @LIB_KFM@
-LIB_KHTML = @LIB_KHTML@
-LIB_KIO = @LIB_KIO@
-LIB_KPARTS = @LIB_KPARTS@
-LIB_KSPELL = @LIB_KSPELL@
-LIB_KSYCOCA = @LIB_KSYCOCA@
-LIB_KUTILS = @LIB_KUTILS@
-LIB_POLL = @LIB_POLL@
-LIB_QPE = @LIB_QPE@
-LIB_QT = @LIB_QT@
-LIB_SMB = @LIB_SMB@
-LIB_SWORD = @LIB_SWORD@
-LIB_X11 = @LIB_X11@
-LIB_XEXT = @LIB_XEXT@
-LIB_XRENDER = @LIB_XRENDER@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MCOPIDL = @MCOPIDL@
-MEINPROC = @MEINPROC@
-MOC = @MOC@
-MSGFMT = @MSGFMT@
-NOOPT_CFLAGS = @NOOPT_CFLAGS@
-NOOPT_CXXFLAGS = @NOOPT_CXXFLAGS@
-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@
-PERL = @PERL@
-QTE_NORTTI = @QTE_NORTTI@
-QT_INCLUDES = @QT_INCLUDES@
-QT_LDFLAGS = @QT_LDFLAGS@
-RANLIB = @RANLIB@
-RPM_GROUP = @RPM_GROUP@
-RPM_PREFIX = @RPM_PREFIX@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SWORD_INCLUDES = @SWORD_INCLUDES@
-SWORD_LIBRARY_PATH = @SWORD_LIBRARY_PATH@
-TOPSUBDIRS = @TOPSUBDIRS@
-UIC = @UIC@
-UIC_TR = @UIC_TR@
-USER_INCLUDES = @USER_INCLUDES@
-USER_LDFLAGS = @USER_LDFLAGS@
-USE_EXCEPTIONS = @USE_EXCEPTIONS@
-USE_RTTI = @USE_RTTI@
-USE_THREADS = @USE_THREADS@
-VERSION = @VERSION@
-WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
-XGETTEXT = @XGETTEXT@
-XMLLINT = @XMLLINT@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_INCLUDES = @X_INCLUDES@
-X_LDFLAGS = @X_LDFLAGS@
-X_PRE_LIBS = @X_PRE_LIBS@
-X_RPATH = @X_RPATH@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-all_includes = @all_includes@
-all_libraries = @all_libraries@
-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@
-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@
-include_ARTS_FALSE = @include_ARTS_FALSE@
-include_ARTS_TRUE = @include_ARTS_TRUE@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-kde_appsdir = @kde_appsdir@
-kde_bindir = @kde_bindir@
-kde_confdir = @kde_confdir@
-kde_datadir = @kde_datadir@
-kde_htmldir = @kde_htmldir@
-kde_icondir = @kde_icondir@
-kde_includes = @kde_includes@
-kde_kcfgdir = @kde_kcfgdir@
-kde_libraries = @kde_libraries@
-kde_libs_htmldir = @kde_libs_htmldir@
-kde_libs_prefix = @kde_libs_prefix@
-kde_locale = @kde_locale@
-kde_mimedir = @kde_mimedir@
-kde_moduledir = @kde_moduledir@
-kde_qtver = @kde_qtver@
-kde_servicesdir = @kde_servicesdir@
-kde_servicetypesdir = @kde_servicetypesdir@
-kde_sounddir = @kde_sounddir@
-kde_styledir = @kde_styledir@
-kde_templatesdir = @kde_templatesdir@
-kde_wallpaperdir = @kde_wallpaperdir@
-kde_widgetdir = @kde_widgetdir@
-kdeinitdir = @kdeinitdir@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-qt_includes = @qt_includes@
-qt_libraries = @qt_libraries@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-x_includes = @x_includes@
-x_libraries = @x_libraries@
-xdg_appsdir = @xdg_appsdir@
-xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
-subdir = pot
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-DIST_SOURCES =
-DIST_COMMON = Makefile.am Makefile.in
-#>- all: all-am
-#>+ 1
-all: docs-am  all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-#>- 	cd $(top_srcdir) && \
-#>- 	  $(AUTOMAKE) --gnu  pot/Makefile
-#>+ 3
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  pot/Makefile
-	cd $(top_srcdir) && perl admin/am_edit pot/Makefile.in
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-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:
-
-#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-#>+ 1
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_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)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-#>- clean: clean-am
-#>+ 1
-clean: kde-rpo-clean  clean-am
-
-#>- clean-am: clean-generic clean-libtool mostlyclean-am
-#>+ 1
-clean-am: clean-bcheck  clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-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
-
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-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
-
-
-messages:
-	echo Preparing documentation files handbook.pot and howto.pot...
-	mkdir -p tmp/
-	for XML_FILE in `cd ..; find docs -name "*.docbook"`; do\
-		echo " creating temporary POT file tmp/$$XML_FILE.pot";\
-		(cd tmp; mkdir -p `dirname $$XML_FILE.pot`; xml2pot ../../$$XML_FILE > $$XML_FILE.pot;)\
-	done
-	echo merging POT files...
-	msgcat --force-po -o handbook.pot `find tmp/docs/handbook -name "*.pot"`
-	msgcat --force-po -o howto.pot `find tmp/docs/howto/ -name "*.pot"`
-	rm -r ./tmp/
-	echo Finished creating handbook.pot and howto.pot.
-	\
-	echo Preparing program messages file messages.pot...
-	perl ./extractrc ../bibletime/xml/*.rc > ../bibletime/rc-dummy.cpp
-	perl ./preparetips ../docs/tips > ../bibletime/tips-dummy.cpp
-	$(XGETTEXT) -C -F -L C++ -ki18n -kI18N_NOOP -x `kde-config --prefix`/include/kde.pot `find .. -type f -not -name clanguagemgr.cpp -and -name \*.cpp -or -name \*.h -or -name \*.cc` -o messages.pot
-	recode iso8859-1..utf-8 messages.pot
-	cp ../bibletime/backend/clanguagemgr.cpp clanguagemgr.cpp
-	$(XGETTEXT) --from-code=utf-8 --join-existing -C -F -L C++ -ki18n -kI18N_NOOP -x `kde-config --prefix`/include/kde.pot clanguagemgr.cpp -o messages.pot
-	rm clanguagemgr.cpp
-	echo Finished creating messages.pot.
-# 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:
-
-#>+ 2
-KDE_DIST=extractrc preparetips handbook.pot messages.pot howto.pot 
-
-#>+ 2
-docs-am:
-
-#>+ 6
-force-reedit:
-		cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  pot/Makefile
-	cd $(top_srcdir) && perl admin/am_edit pot/Makefile.in
-
-
-#>+ 21
-clean-bcheck: 
-	rm -f *.bchecktest.cc *.bchecktest.cc.class a.out
-
-bcheck: bcheck-am
-
-bcheck-am:
-	@for i in ; do \
-	    if test $(srcdir)/$$i -nt $$i.bchecktest.cc; then \
-	        echo "int main() {return 0;}" > $$i.bchecktest.cc ; \
-	        echo "#include \"$$i\"" >> $$i.bchecktest.cc ; \
-	        echo "$$i"; \
-	        if ! $(CXX) $(DEFS) -I. -I$(srcdir) -I$(top_builddir) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(KDE_CXXFLAGS)  --dump-class-hierarchy -c $$i.bchecktest.cc; then \
-	            rm -f $$i.bchecktest.cc; exit 1; \
-	        fi ; \
-	        echo "" >> $$i.bchecktest.cc.class; \
-	        perl $(top_srcdir)/admin/bcheck.pl $$i.bchecktest.cc.class || { rm -f $$i.bchecktest.cc; exit 1; }; \
-	        rm -f a.out; \
-	    fi ; \
-	done
-
-
-#>+ 3
-final:
-	$(MAKE) all-am
-
-#>+ 3
-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-no-final:
-	$(MAKE) all-am
-
-#>+ 3
-no-final-install:
-	$(MAKE) install-am
-
-#>+ 3
-cvs-clean:
-	$(MAKE) admindir=$(top_srcdir)/admin -f $(top_srcdir)/admin/Makefile.common cvs-clean
-
-#>+ 3
-kde-rpo-clean:
-	-rm -f *.rpo
-
-#>+ 3
-nmcheck: 
-nmcheck-am: nmcheck
diff --git a/pot/extractrc b/pot/extractrc
deleted file mode 100644
index 368849d..0000000
--- a/pot/extractrc
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /usr/bin/perl
-
-#  NOTE: this script is part of the KDE SDK and added to KDevelop to support KDE 2 application development.
-#  The original is located in the KDE CVS module kdesdk/scripts. It gets installed in the same directory as
-#  the KDevelop binary to be in your PATH.
-#
-#  What it does is extract the strings in an application´s .rc file, e.g. testappui.rc, and writes into the pot file
-#  where the translations are build with (po-files)
-#
-#  Added to KDevelop 2000-10-29, Ralf Nolden (nolden@kde.org)
-
-$linenr = 0;
-$filename = "";
-@filenames = ();
-
-sub writeoutstring($)
-{
-   print STDOUT "i18n(\"@_[0]\");\n";
-}
-
-while (defined ($ARGV[0]))
-{
-   $_ = shift; 
-   $filename = $_; # maybe check for options
-
-if (! $filename) {
-   print STDERR "no file to open\n";
-   exit 1;
-}
-
-$string = "";
-$intext = 0;
-
-open(FILE, $filename);
-while ( <FILE> ) {
-   $linenr++;
-
-   $string .= $_;   
-   chomp($string);
- 
-   $textstring = '([tT][eE][xX][tT]|string)>';
-
-   if ($intext == 0) {
-     if ($string =~ /<$textstring/) {
-       $string =~ s/^.*<$textstring//;
-       $intext = 1;
-	   $starting_linenr = $linenr;
-     } else {
-       $string = "";
-     }
-   }
-   
-   if (($intext == 1) && ($string =~ /<\/$textstring/)) {
-     my $text = $string;
-     $text =~ s/<\/$textstring.*$//;
-	 $text =~ s/&lt;/</g;
-     $text =~ s/&gt;/>/g;
-     $text =~ s/&amp;/&/g; 
-     writeoutstring($text); 
-     $string =~ s/^.*<\/$textstring//;
-     $intext = 0;
-	 if ($linenr != $starting_linenr) {
-		print STDERR "there is <text> floating\n";
-     }
-   }
-
-}
-
-if ($intext == 1) {
- print STDERR "parsing error in $filename $linenr\n";
- exit 1;
-}
-
-}
diff --git a/pot/handbook.pot b/pot/handbook.pot
deleted file mode 100644
index a569559..0000000
--- a/pot/handbook.pot
+++ /dev/null
@@ -1,3110 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-09 01:25+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=utf-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: index.docbook:1
-#, no-c-format
-msgid "Configuring &bibletime;"
-msgstr ""
-
-#: index.docbook:3
-#, no-c-format
-msgid ""
-"The &bibletime; user interface can be customized in many ways depending on "
-"your needs. To access the configuration dialogs, in the main toolbar select "
-"<guimenu>settings</guimenu>. From here select <guimenuitem>configure "
-"toolbars</guimenuitem> to launch the dialog configure toolbars dialog, or "
-"select <guimenuitem>Configure &bibletime;</guimenuitem> to launch the "
-"options dialog."
-msgstr ""
-
-#: index.docbook:10
-#, no-c-format
-msgid "Configure Toolbars Dialog"
-msgstr ""
-
-#: index.docbook:11
-#, no-c-format
-msgid ""
-"The Configure Toolbars dialog allows adding and removing actions from the "
-"main toolbar of &bibletime;. The order of actions in the main toolbar can "
-"also be changed."
-msgstr ""
-
-#: index.docbook:14
-#, no-c-format
-msgid "Toolbar Configuration Dialog"
-msgstr ""
-
-#: index.docbook:14
-#, no-c-format
-msgid "The Toolbar Configuration dialog."
-msgstr ""
-
-#: index.docbook:27
-#, no-c-format
-msgid "Preferences - &bibletime; Dialog"
-msgstr ""
-
-#: index.docbook:28
-#, no-c-format
-msgid ""
-"The preferences dialog allows many &bibletime; and &sword; features to be "
-"customized."
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "Startup"
-msgstr ""
-
-#: index.docbook:32
-#, no-c-format
-msgid ""
-"The startup behavior can be customized. Select from the following options:"
-msgstr ""
-
-#: index.docbook:34
-#, no-c-format
-msgid "Show tip of the day"
-msgstr ""
-
-#: index.docbook:34
-#, no-c-format
-msgid "Show startup Logo"
-msgstr ""
-
-#: index.docbook:34
-#, no-c-format
-msgid "Restore windows from the last &bibletime; session"
-msgstr ""
-
-#: index.docbook:39
-#, no-c-format
-msgid "Preferences Dialog"
-msgstr ""
-
-#: index.docbook:39
-#, no-c-format
-msgid "The Preferences dialog - Startup."
-msgstr ""
-
-#: index.docbook:51
-#, no-c-format
-msgid "Fonts"
-msgstr ""
-
-#: index.docbook:52
-#, no-c-format
-msgid ""
-"&bibletime; uses the &kde; general display font. The &kde; general display "
-"font can be changed from the &kcontrolcenter;. If the module you are using "
-"does not display correctly with the general display font, use the fonts "
-"options dialog to select a different one. &bibletime; now applies font "
-"selections to specific languages."
-msgstr ""
-
-#: index.docbook:58
-#, no-c-format
-msgid "Options Dialog - fonts"
-msgstr ""
-
-#: index.docbook:58
-#, no-c-format
-msgid "The Options dialog - Fonts."
-msgstr ""
-
-#: index.docbook:70
-#, no-c-format
-msgid "What kind of fonts can I use?"
-msgstr ""
-
-#: index.docbook:71
-#, no-c-format
-msgid ""
-"&bibletime; can now use any system fonts. These may be Bitmap Fonts, "
-"<trademark class=\"registered\">Adobe</trademark> Type1 Fonts, <trademark "
-"class=\"registered\">Adobe</trademark> Type3 fonts, or <trademark class="
-"\"registered\">TrueType</trademark>. These fonts may be supplied with your "
-"distribution, or may be obtained separately."
-msgstr ""
-
-#: index.docbook:77
-#, no-c-format
-msgid ""
-"As long as the modules you are interested in display correctly nothing needs "
-"to be done here. If a module you are interested in displays as a series of "
-"question marks (???????????????????) or empty boxes the font available to "
-"&bibletime; does not contain the characters used in your document."
-msgstr ""
-
-#: index.docbook:82
-#, no-c-format
-msgid ""
-"In the fonts options dialog, choose the desired language from the drop down "
-"menu. Select the use custom font checkbox. Now select a font. Clearlyu "
-"supports most languages so it is a good first try. If no installed font can "
-"be found that displays the module you are interested in, try installing the "
-"&kde; localization package for that language."
-msgstr ""
-
-#: index.docbook:88
-#, no-c-format
-msgid "Installing fonts"
-msgstr ""
-
-#: index.docbook:89
-#, no-c-format
-msgid ""
-"Detailed font installation instructions are outside the scope of this "
-"handbook. If you need detailed font installation information, please read "
-"the <ulink url=\"http://pegasus.rutgers.edu/~elflord/font_howto\">Font-"
-"HOWTO</ulink>, and <ulink url=\"http://www.ibiblio.org/pub/Linux/docs/HOWTO/"
-"other-formats/html_single/Unicode-HOWTO.html#toc4\"> The Unicode HOWTO</"
-"ulink>"
-msgstr ""
-
-#: index.docbook:95
-#, no-c-format
-msgid ""
-"If your distribution includes a font installer use it, it makes font "
-"installation much easier!"
-msgstr ""
-
-#: index.docbook:98
-#, no-c-format
-msgid ""
-"If you use a small font like clearlyu (about 22kb) &bibletime; will run "
-"faster than if a large font like <trademark class=\"registered\">Bitstream "
-"Cyberbit</trademark> (about 12Mb) is used."
-msgstr ""
-
-#: index.docbook:103
-#, no-c-format
-msgid "Obtaining Fonts"
-msgstr ""
-
-#: index.docbook:104
-#, no-c-format
-msgid "Fonts can be obtained from a number of sources."
-msgstr ""
-
-#: index.docbook:105
-#, no-c-format
-msgid "Your distribution."
-msgstr ""
-
-#: index.docbook:105
-#, no-c-format
-msgid "Your distribution's localization packages."
-msgstr ""
-
-#: index.docbook:105
-#, no-c-format
-msgid "An existing &Microsoft; &Windows; installation on the same computer."
-msgstr ""
-
-#: index.docbook:105
-#, no-c-format
-msgid ""
-"A font collection, such as are available from <trademark class=\"registered"
-"\">Adobe</trademark> or <trademark class=\"registered\">Bitstream</"
-"trademark>."
-msgstr ""
-
-#: index.docbook:105
-#, no-c-format
-msgid "On line font collections."
-msgstr ""
-
-#: index.docbook:115
-#, no-c-format
-msgid ""
-"Unicode fonts support more characters than other fonts, so are generally a "
-"good choice for &bibletime;, some of these fonts are available at no charge. "
-"Few of the fonts available include all of range of symbols defined in the "
-"Unicode standard, so you may try several before finding what you need"
-msgstr ""
-
-#: index.docbook:119
-#, no-c-format
-msgid "Here is a listing of some of the fonts available:"
-msgstr ""
-
-#: index.docbook:120
-#, no-c-format
-msgid "Unicode Fonts"
-msgstr ""
-
-#: index.docbook:120
-#, no-c-format
-msgid "Clearlyu"
-msgstr ""
-
-#: index.docbook:120
-#, no-c-format
-msgid ""
-"Included in some distributions. Contains European, Greek, Hebrew, Thai. Does "
-"not contain Chinease pictographs, or Arabic"
-msgstr ""
-
-#: index.docbook:120
-#, no-c-format
-msgid ""
-"<ulink url=\"ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS\">ftp://ftp."
-"crosswire.org/pub/sword/iso/latest/FONTS</ulink>."
-msgstr ""
-
-#: index.docbook:120
-#, no-c-format
-msgid "Several fonts available from the Crosswire Bible Society ftp site."
-msgstr ""
-
-#: index.docbook:120
-#, no-c-format
-msgid "Bitstream CyberBit"
-msgstr ""
-
-#: index.docbook:120
-#, no-c-format
-msgid "Covers almost the entire range of Unicode."
-msgstr ""
-
-#: index.docbook:120
-#, no-c-format
-msgid "Caslon, Monospace, Cupola, Caliban"
-msgstr ""
-
-#: index.docbook:120
-#, no-c-format
-msgid "Partial coverage, see information on linked site."
-msgstr ""
-
-#: index.docbook:140
-#, no-c-format
-msgid ""
-"The most complete listing of Unicode fonts that we are aware of is <ulink "
-"url=\"http://www.ccss.de/slovo/unifonts.htm\"> Christoph Singer's "
-"\"Multilingual Unicode TrueType Fonts in the Internet\"</ulink> with 24 "
-"fonts listed."
-msgstr ""
-
-#: index.docbook:143
-#, no-c-format
-msgid ""
-"Another Unicode font list can be found at: <ulink url=\"http://www.hclrss."
-"demon.co.uk/unicode/fontsbyrange.html\"> Unicode Font List</ulink>."
-msgstr ""
-
-#: index.docbook:149
-#, no-c-format
-msgid "Colors"
-msgstr ""
-
-#: index.docbook:150
-#, no-c-format
-msgid ""
-"The colors of the objects in display windows can be customized. Objects that "
-"can be customized are:"
-msgstr ""
-
-#: index.docbook:152
-#, no-c-format
-msgid "Text"
-msgstr ""
-
-#: index.docbook:152
-#, no-c-format
-msgid "Highlighted verse"
-msgstr ""
-
-#: index.docbook:152
-#, no-c-format
-msgid "Footnotes"
-msgstr ""
-
-#: index.docbook:152
-#, no-c-format
-msgid "Morphological Tags"
-msgstr ""
-
-#: index.docbook:152
-#, no-c-format
-msgid "Background"
-msgstr ""
-
-#: index.docbook:152
-#, no-c-format
-msgid "Hyperlinks"
-msgstr ""
-
-#: index.docbook:152
-#, no-c-format
-msgid "Strong's Numbers"
-msgstr ""
-
-#: index.docbook:152
-#, no-c-format
-msgid "Words of Jesus"
-msgstr ""
-
-#: index.docbook:163
-#, no-c-format
-msgid ""
-"Some options like \"Words of Jesus\" only apply to texts which support this "
-"special feature."
-msgstr ""
-
-#: index.docbook:165
-#, no-c-format
-msgid "Options Dialog - Color"
-msgstr ""
-
-#: index.docbook:165
-#, no-c-format
-msgid "The Options dialog - Color."
-msgstr ""
-
-#: index.docbook:179
-#, no-c-format
-msgid "Sessions"
-msgstr ""
-
-#: index.docbook:180
-#, no-c-format
-msgid ""
-"Sessions define the appearance of the work area, for example which windows "
-"are open and which texts should be displayed in these windows. Once a "
-"session is created, use the menu item <guimenu>Window</guimenu> -> "
-"<guimenuitem>Save session</guimenuitem> to save a current session into a "
-"session file. Use <guimenu>Window</guimenu> -> <guimenuitem>Load session</"
-"guimenuitem> to load a previously saved session into &bibletime;."
-msgstr ""
-
-#: index.docbook:188
-#, no-c-format
-msgid "Sword"
-msgstr ""
-
-#: index.docbook:189
-#, no-c-format
-msgid ""
-"Many features provided by the Sword backend can now be customized in "
-"&bibletime;."
-msgstr ""
-
-#: index.docbook:191
-#, no-c-format
-msgid "Options Dialog - Sword"
-msgstr ""
-
-#: index.docbook:191
-#, no-c-format
-msgid "The Options dialog - Sword."
-msgstr ""
-
-#: index.docbook:203
-#, no-c-format
-msgid "Sword General"
-msgstr ""
-
-#: index.docbook:204
-#, no-c-format
-msgid "Key Cache for Lexicons"
-msgstr ""
-
-#: index.docbook:205
-#, no-c-format
-msgid ""
-"&bibletime; can create a key cache for lexicons. This speeds up opening "
-"large lexicon modules. The cache file does use some disc space, so if your "
-"computer has only a small amount of free space, you might want to disable "
-"this feature."
-msgstr ""
-
-#: index.docbook:210
-#, no-c-format
-msgid "Scrolling Behavior"
-msgstr ""
-
-#: index.docbook:211
-#, no-c-format
-msgid ""
-"The default is that a down arrow moves the current position in a text to the "
-"next verse. This option allows the down arrow to move the current position "
-"in a text to the previous verse."
-msgstr ""
-
-#: index.docbook:215
-#, no-c-format
-msgid "Specify a language for biblical book names"
-msgstr ""
-
-#: index.docbook:216
-#, no-c-format
-msgid ""
-"This feature allows the language used to displayed book names to be changed. "
-"For example the King James Version can be displayed with German book names. "
-"If your language is not displayed and you would like to create a sword "
-"locale for your language, please see the CrossWire Bible Society developers "
-"site for details."
-msgstr ""
-
-#: index.docbook:224
-#, no-c-format
-msgid "Sword Default Modules"
-msgstr ""
-
-#: index.docbook:225
-#, no-c-format
-msgid "Default modules are specified here."
-msgstr ""
-
-#: index.docbook:227
-#, no-c-format
-msgid "Sword Filter Settings"
-msgstr ""
-
-#: index.docbook:228
-#, no-c-format
-msgid ""
-"Filters control the appearance of text in the display windows. Here you can "
-"chose the default settings for the various filters."
-msgstr ""
-
-#: index.docbook:230
-#, no-c-format
-msgid "The items controlled by filters are:"
-msgstr ""
-
-#: index.docbook:232
-#, no-c-format
-msgid "Show line break after each verse"
-msgstr ""
-
-#: index.docbook:232
-#, no-c-format
-msgid "Show verse numbers"
-msgstr ""
-
-#: index.docbook:232
-#, no-c-format
-msgid "Show footnotes"
-msgstr ""
-
-#: index.docbook:232
-#, no-c-format
-msgid "Show Strong's numbers"
-msgstr ""
-
-#: index.docbook:232
-#, no-c-format
-msgid "Show headings"
-msgstr ""
-
-#: index.docbook:232
-#, no-c-format
-msgid "Show morphologic tags"
-msgstr ""
-
-#: index.docbook:232
-#, no-c-format
-msgid "Show lemmas"
-msgstr ""
-
-#: index.docbook:232
-#, no-c-format
-msgid "Show Hebrew vowel points"
-msgstr ""
-
-#: index.docbook:232
-#, no-c-format
-msgid "Show Hebrew cantillation marks"
-msgstr ""
-
-#: index.docbook:232
-#, no-c-format
-msgid "Show Greek accents"
-msgstr ""
-
-#: index.docbook:249
-#, no-c-format
-msgid "Accelerators"
-msgstr ""
-
-#: index.docbook:250
-#, no-c-format
-msgid ""
-"Accelerators are special key commands that can be used in the place of the "
-"menu items and icons. A number of &bibletime;'s commands have predefined "
-"Accelerators. All of &bibletime;'s commands can be assigned accelerators "
-"here."
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Default accelerators"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Action"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Key combination"
-msgstr ""
-
-#: index.docbook:255 index.docbook:555
-#, no-c-format
-msgid "Auto Tile"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Ctrl+Alt+T"
-msgstr ""
-
-#: index.docbook:255 index.docbook:555
-#, no-c-format
-msgid "Auto Cascade"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Ctrl+Alt+A"
-msgstr ""
-
-#: index.docbook:255 index.docbook:555
-#, no-c-format
-msgid "Cascade"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Ctrl+A"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Close All"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Shift+Ctrl+A"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Configure Toolbars"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "<entry></entry>"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Preferences"
-msgstr ""
-
-#: index.docbook:255 index.docbook:470
-#, no-c-format
-msgid "Quit"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Ctrl+Q"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Remove Selected Item(s)"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Ctrl+Alt+D"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Reset Main Index"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Ctrl+Alt+R"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Search in Selected Module(s)"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Ctrl+Alt+S"
-msgstr ""
-
-#: index.docbook:255 index.docbook:555
-#, no-c-format
-msgid "Tile"
-msgstr ""
-
-#: index.docbook:255
-#, no-c-format
-msgid "Ctrl+T"
-msgstr ""
-
-#: index.docbook:1
-#, no-c-format
-msgid "Introduction"
-msgstr ""
-
-#: index.docbook:3
-#, no-c-format
-msgid ""
-"&bibletime; is a powerful Bible study tool written for the &kde; environment "
-"on the Linux operating system. It is based on the <ulink url=\"http://www."
-"crosswire.org/sword\">Sword</ulink> library, which provides the back-end "
-"functionality for &bibletime;, such as viewing Bible text, searching, "
-"bookmarking, etc. Sword is the flagship product of the <ulink url=\"http://"
-"www.crosswire.org\">Crosswire Bible Society</ulink>."
-msgstr ""
-
-#: index.docbook:11
-#, no-c-format
-msgid ""
-"&bibletime; is designed to be used with documents that have been encoded in "
-"Theological Markup Language (ThML) and General Bible Format (GBF). These "
-"markup languages are focused on the requirements of religious texts. "
-"Complete information on the supported document formats can be found in the "
-"<ulink url=\"http://www.crosswire.org/sword/develop/index.jsp\"> developers "
-"section of the Sword Project, Crosswire Bible Society</ulink>."
-msgstr ""
-
-#: index.docbook:18
-#, no-c-format
-msgid ""
-"Over 200 documents in 50 languages are available from the <ulink url="
-"\"http://www.crosswire.org\">Crosswire Bible Society</ulink>. These include:"
-msgstr ""
-
-#: index.docbook:23
-#, no-c-format
-msgid "Bibles"
-msgstr ""
-
-#: index.docbook:23
-#, no-c-format
-msgid ""
-"The full Bible text, with optional things like Strong's Numbers and "
-"footnotes in the text. The Strong Numbers hot link to the entry in Strong's "
-"Hebrew Bible Dictionary or Strong's Greek Bible Dictionary. Bibles are "
-"available in many languages, and include not only modern versions, but also "
-"Ancient texts like the Aleppo Codex (Hebrew), and the Septuagint (Greek)."
-msgstr ""
-
-#: index.docbook:23
-#, no-c-format
-msgid "Commentaries"
-msgstr ""
-
-#: index.docbook:23
-#, no-c-format
-msgid ""
-"Commentaries available include classics like John Wesley's Notes on the "
-"Bible, and Luther's Commentary on Galatians. With the <emphasis>Personal</"
-"emphasis> commentary you can record your own personal notes to different "
-"parts of the Bible."
-msgstr ""
-
-#: index.docbook:23
-#, no-c-format
-msgid "Lexicons"
-msgstr ""
-
-#: index.docbook:23
-#, no-c-format
-msgid ""
-"Lexicons available include: Robinson's Morphological Analysis Codes, Brown-"
-"Driver-Briggs Hebrew Lexicon, International Standard Bible Encyclopedia"
-msgstr ""
-
-#: index.docbook:23
-#, no-c-format
-msgid "Dictionaries"
-msgstr ""
-
-#: index.docbook:23
-#, no-c-format
-msgid ""
-"Dictionaries available include Strong's Hebrew Bible Dictionary, Strong's "
-"Greek Bible Dictionary, Webster's Revised Unabridged Dictionary of the "
-"English Language 1913, Nave's Topical Bible."
-msgstr ""
-
-#: index.docbook:23
-#, no-c-format
-msgid "Books"
-msgstr ""
-
-#: index.docbook:23
-#, no-c-format
-msgid ""
-"Books available include &quot;Imitation of Christ&quot;, &quot;Enuma "
-"Elish&quot;, and &quot;Josephus, the complete works&quot;"
-msgstr ""
-
-#: index.docbook:77
-#, no-c-format
-msgid ""
-"Additional documents are being added to the &sword; repository frequently, "
-"so visit often."
-msgstr ""
-
-#: index.docbook:79
-#, no-c-format
-msgid "Changes"
-msgstr ""
-
-#: index.docbook:80
-#, no-c-format
-msgid ""
-"Please read the file Changelog of the sourcecode package if you are "
-"interested in more detailed changes."
-msgstr ""
-
-#: index.docbook:84
-#, no-c-format
-msgid ""
-"A listing of the features included in the current package can be found in "
-"the sourcecode at <ulink url=\"http://cvs.sourceforge.net/cgi-bin/viewcvs."
-"cgi/*checkout*/bibletime/bibletime/ChangeLog?rev=HEAD&amp;content-type=text/"
-"plain\"> CVS log for <filename>bibletime/bibletime/ChangeLog</filename></"
-"ulink>"
-msgstr ""
-
-#: index.docbook:89
-#, no-c-format
-msgid "Changes for &bibletime; Release 1.3"
-msgstr ""
-
-#: index.docbook:90
-#, no-c-format
-msgid ""
-"&bibletime; version 1.3 provides a number of bugfixes and stability "
-"improvements. You will also find a number of changes to the appearance of "
-"bibletime. This is a partial list, for a more complete list, see the "
-"changlog."
-msgstr ""
-
-#: index.docbook:95
-#, no-c-format
-msgid "Main window"
-msgstr ""
-
-#: index.docbook:96
-#, no-c-format
-msgid ""
-"Main index was reorganized, sorting the modules by type of module, then by "
-"language."
-msgstr ""
-
-#: index.docbook:99
-#, no-c-format
-msgid ""
-"Bookmarks are now stored in an XML file, but the old format can still be "
-"imported. After upgrading an existing installation the old bookmarks are "
-"placed in the \"Old bookmarks\" subfolder."
-msgstr ""
-
-#: index.docbook:104
-#, no-c-format
-msgid "Drag&amp;Drop works now for more than one item."
-msgstr ""
-
-#: index.docbook:106
-#, no-c-format
-msgid ""
-"Search default Bible and search open modules options added in the search "
-"menu."
-msgstr ""
-
-#: index.docbook:110
-#, no-c-format
-msgid "Searchdialog"
-msgstr ""
-
-#: index.docbook:111
-#, no-c-format
-msgid ""
-"Major redesign of the user interface, reducing the number of tabs to two "
-"(search and result). Features have been moved to the appropriate tab."
-msgstr ""
-
-#: index.docbook:115
-#, no-c-format
-msgid "Display windows"
-msgstr ""
-
-#: index.docbook:116
-#, no-c-format
-msgid ""
-"Separated now in &quot;read only&quot; and &quot;write only&quot; windows. "
-"Write windows can be opened by <mousebutton>right</mousebutton> mouse button "
-"menu in the main index on the Personal Commentary module (or any other "
-"RawFiles module)."
-msgstr ""
-
-#: index.docbook:120
-#, no-c-format
-msgid "Options dialog"
-msgstr ""
-
-#: index.docbook:121
-#, no-c-format
-msgid ""
-"A custom font can now be specified for each language. The default font is "
-"KDE's default font, and will work for most modules."
-msgstr ""
-
-#: index.docbook:128
-#, no-c-format
-msgid "ToDo"
-msgstr ""
-
-#: index.docbook:129
-#, no-c-format
-msgid ""
-"We have lots to do. Because we are a very small team of active developers "
-"it's very hard to get reasonable results in a short time. If you are "
-"interested in helping the &bibletime; team, please contact us at <ulink url="
-"\"http://sourceforge.net/pm/?group_id=954\">Sourceforge &bibletime; home "
-"page</ulink>. Information can also be found at <ulink url=\"http://www."
-"bibletime.info/\">the &bibletime; homepage</ulink>."
-msgstr ""
-
-#: index.docbook:137
-#, no-c-format
-msgid ""
-"The &bibletime; project needs programmers / developers, translators, "
-"reviewers, testers, and prayer warriors. If you can help with any of these "
-"tasks or think up another, please join us. Without your help, &bibletime; "
-"will develop very very slow and it will take a very long time until you get "
-"a full-featured Bible study tool."
-msgstr ""
-
-#: index.docbook:144
-#, no-c-format
-msgid "Motivation"
-msgstr ""
-
-#: index.docbook:145
-#, no-c-format
-msgid ""
-"Our desire is to serve God, and to do our part to help others grow in their "
-"relationship with Him. We have found a gaping hole, in that there has been a "
-"total lack of user-friendly Bible-study software available for &Linux;-based "
-"computers. We have developed &bibletime; to fill that void. We have striven "
-"to make this a powerful, quality program, and still make it simple and "
-"intuitive to operate. It is our desire that God be praised, as He is the "
-"source of all good things."
-msgstr ""
-
-#: index.docbook:156
-#, no-c-format
-msgid ""
-"Every good thing given and every perfect gift is from above, coming down "
-"from the Father of lights, with whom there is no variation or shifting "
-"shadow."
-msgstr ""
-
-#: index.docbook:161
-#, no-c-format
-msgid ""
-"God bless you as you use this program, and may He be glorified by the work "
-"of our hands!"
-msgstr ""
-
-#: index.docbook:1
-#, no-c-format
-msgid "Program Operation"
-msgstr ""
-
-#: index.docbook:2
-#, no-c-format
-msgid ""
-"&bibletime; is mainly operated from the Module Tree (this tree is called the "
-"\"Main Index\"). The second important place to work with &bibletime; is the "
-"MDI area (MDI = Multiple Document Interface)."
-msgstr ""
-
-#: index.docbook:8
-#, no-c-format
-msgid "Main Index"
-msgstr ""
-
-#: index.docbook:9
-#, no-c-format
-msgid ""
-"This is the pane on the left side of the &bibletime; window. It contains the "
-"tree of installed documents (Sword Modules), as well as any bookmarks you "
-"enter."
-msgstr ""
-
-#: index.docbook:14
-#, no-c-format
-msgid "Module Tree"
-msgstr ""
-
-#: index.docbook:25
-#, no-c-format
-msgid "Selecting a document to view"
-msgstr ""
-
-#: index.docbook:27
-#, no-c-format
-msgid ""
-"To select a document, click with the <mousebutton>left</mousebutton> mouse "
-"button on the desired document group (Bibles, Commentaries, Lexicons, Books, "
-"Devotionals or Glossaries) to display the contents of a document group, "
-"click with the <mousebutton>right</mousebutton> mouse button on the icon for "
-"the desired group. To open a document, click on it's icon."
-msgstr ""
-
-#: index.docbook:32
-#, no-c-format
-msgid "Document Selection"
-msgstr ""
-
-#: index.docbook:40 index.docbook:86
-#, no-c-format
-msgid "Drag &amp; Drop Works Here"
-msgstr ""
-
-#: index.docbook:41
-#, no-c-format
-msgid ""
-"A document can be opened from an already opened document. Simply click with "
-"the <mousebutton>left</mousebutton> mouse button on the verse number "
-"(pointer changes to hand) and drag it to the module list. Drop it on the "
-"name of the module you want to open, and it will open that module to the "
-"verse you dragged over. If you drag a verse number to an already open "
-"module, it will automatically jump that module to the location of the verse "
-"that was dragged over. This works for Bibles and Commentaries only."
-msgstr ""
-
-#: index.docbook:48
-#, no-c-format
-msgid ""
-"There are two other functions accessible through clicking with the "
-"<mousebutton>right</mousebutton> mouse button on the document name. \"About "
-"This Module\" opens a window with information about copyright and other "
-"pertinent things about the selected document. \"Unlock This Module\" opens a "
-"small dialog for encrypted documents. This allows those with the key to "
-"enter it to decrypt the document and make it human-readable. Crosswire Bible "
-"Society must encrypt modules unless either the copyright holder provides "
-"permission for distribution as a sword module, or the text has passed into "
-"the public domain (copyright has expired). <ulink url=\"http://www.crosswire."
-"org/sword/modules/aboutlocked.jsp\"> See information on locked modules on "
-"the Crosswire Bible Society web site.</ulink>"
-msgstr ""
-
-#: index.docbook:63
-#, no-c-format
-msgid "Accessing the search dialog"
-msgstr ""
-
-#: index.docbook:63
-#, no-c-format
-msgid ""
-"You can search in a module by clicking with the <mousebutton>right</"
-"mousebutton> mouse button on the module name in the module list and "
-"selecting \"Search in module(s)\". By pressing shift and clicking on other "
-"module names you can select more than one. Then follow the same procedure to "
-"open the search dialog. You will be searching in all of these documents. A "
-"complete description of the operation of the search features can be found "
-"<link linkend=\"hdbk-op-search\">here</link>."
-msgstr ""
-
-#: index.docbook:73 index.docbook:97
-#, no-c-format
-msgid "Bookmark Selection"
-msgstr ""
-
-#: index.docbook:85
-#, no-c-format
-msgid "Accessing bookmark functions"
-msgstr ""
-
-#: index.docbook:86
-#, no-c-format
-msgid ""
-"Click with the <mousebutton>right</mousebutton> mouse button on the bookmark "
-"group of the module tree window and select <guimenuitem>&quot;Create new "
-"folder&quot;</guimenuitem> to create a new bookmark sub folder. You can use "
-"normal drag 'n' drop functions to drag verse numbers from search dialog "
-"results to the bookmark folder, and to rearrange bookmarks between folders. "
-"There is an import/export function for bookmarks also. From the "
-"<guimenu>right-mouse-button menu</guimenu>, select &quot;Export "
-"bookmarks&quot;. This will bring up a dialog box for you to save the "
-"bookmark collection. They can be shared with other &bibletime; users, "
-"archived, etc. They can be imported in the same way. You can also click with "
-"the <mousebutton>right</mousebutton> mouse button to change folder names and "
-"bookmark descriptions, and delete folders and bookmarks."
-msgstr ""
-
-#: index.docbook:110
-#, no-c-format
-msgid "Multiple Document Interface (MDI) Window"
-msgstr ""
-
-#: index.docbook:111
-#, no-c-format
-msgid ""
-"This is where the opened documents are displayed. Documents are displayed in "
-"\"Display Windows\", that are specific to the four types of documents. "
-"Crosswire Bible Society may release other document types for sword in the "
-"future. When they are released, &bibletime; will support them as well."
-msgstr ""
-
-#: index.docbook:118
-#, no-c-format
-msgid "Controlling Open Documents"
-msgstr ""
-
-#: index.docbook:118
-#, no-c-format
-msgid ""
-"Document Windows can be controlled and manipulated with normal &kde; window/"
-"title bar functions. In addition to this, you can tile and cascade open "
-"Document Windows. Use the appropriate tool bar buttons, or menu functions "
-"under <guimenu>&quot;Window&quot;</guimenu> in the main menubar. Document "
-"Windows can be set to automatically cascade or tile also."
-msgstr ""
-
-#: index.docbook:126
-#, no-c-format
-msgid "Navigating in Open Documents"
-msgstr ""
-
-#: index.docbook:126
-#, no-c-format
-msgid ""
-"Navigation within a document is accomplished with the Document Key Control "
-"Menu, and the scroll bar."
-msgstr ""
-
-#: index.docbook:130
-#, no-c-format
-msgid "To move to a specific location use the Document Key Control."
-msgstr ""
-
-#: index.docbook:131
-#, no-c-format
-msgid "To move within a section of a document use the scroll bar."
-msgstr ""
-
-#: index.docbook:132
-#, no-c-format
-msgid ""
-"For Bible texts the index key is <emphasis>Book - Chapter - Verse</emphasis>"
-msgstr ""
-
-#: index.docbook:133
-#, no-c-format
-msgid ""
-"For commentaries the index key is <emphasis>Book - Chapter - Verse</emphasis>"
-msgstr ""
-
-#: index.docbook:134
-#, no-c-format
-msgid "For lexicons the index key is <emphasis>Keyword</emphasis>"
-msgstr ""
-
-#: index.docbook:135
-#, no-c-format
-msgid ""
-"Drag &amp; Drop Works Here; if you drag a verse from one open document or a "
-"bookmark and drop it on another the second document will jump from it's "
-"current location to the location of the verse or bookmark dragged."
-msgstr ""
-
-#: index.docbook:141
-#, no-c-format
-msgid "Editing your own commentary"
-msgstr ""
-
-#: index.docbook:142
-#, no-c-format
-msgid ""
-"If the personal commentary is opened with a <mousebutton>left</mousebutton> "
-"mouse button it opens in read only mode. If you wish to make entries to the "
-"personal commentary, <mousebutton>right</mousebutton> mouse button on the "
-"<menuchoice>personal commentary</menuchoice> brings up the choice of the "
-"<guimenuitem>plane text or the HTML editors</guimenuitem>."
-msgstr ""
-
-#: index.docbook:147
-#, no-c-format
-msgid ""
-"If the editor does not save an entry, please check that you have permission "
-"to write to the personal commentary."
-msgstr ""
-
-#: index.docbook:149
-#, no-c-format
-msgid "The pencil icon is shown for the commentary editor"
-msgstr ""
-
-#: index.docbook:150
-#, no-c-format
-msgid "Enter your notes"
-msgstr ""
-
-#: index.docbook:158
-#, no-c-format
-msgid ""
-"The personal commentary editors are provided with a search key and save "
-"button. The HTML editor is also provided with the basic functions font name, "
-"size, color, italicize, underline and some paragraph formating "
-"possibilities. As with all good modern editors What You See Is What You Get."
-msgstr ""
-
-#: index.docbook:163
-#, no-c-format
-msgid ""
-"To delete notes for a selected verse, click the <guibutton>delete verse "
-"button</guibutton> <inlinemediaobject> <imageobject> <imagedata fileref="
-"\"hdbk-op-delete-verse.png\"/> </imageobject> <textobject> <phrase>Delete "
-"Verse Symbol</phrase> </textobject> </inlinemediaobject>."
-msgstr ""
-
-#: index.docbook:181
-#, no-c-format
-msgid ""
-"The personal commentary is a sword module. If you do not find it in the main "
-"index, get it from the <ulink url=\"http://www.crosswire.org\"> Crosswire "
-"Bible Society</ulink>."
-msgstr ""
-
-#: index.docbook:184
-#, no-c-format
-msgid ""
-"If you can not write to the personal commentary your permissions for the "
-"personal commentary module are wrong. Reset the permissions to allow your "
-"user to write to it."
-msgstr ""
-
-#: index.docbook:187
-#, no-c-format
-msgid ""
-"Drag &amp; Drop Works Here, just like other commentaries and Bible texts."
-msgstr ""
-
-#: index.docbook:195
-#, no-c-format
-msgid "Searching in Documents"
-msgstr ""
-
-#: index.docbook:196
-#, no-c-format
-msgid ""
-"Portions of the instructions for the use of GCC Regular Expression in "
-"Searching Documents is taken from the help files for the <trademark class="
-"\"registered\">Microsoft Windows</trademark> version of &sword;."
-msgstr ""
-
-#: index.docbook:201
-#, no-c-format
-msgid "Accessing search functions"
-msgstr ""
-
-#: index.docbook:202
-#, no-c-format
-msgid ""
-"You can search in a document by clicking with the <mousebutton>right</"
-"mousebutton> mouse button on the document name in the <guimenu>Main Index</"
-"guimenu> and selecting <guimenuitem>Search in module(s)</guimenuitem>. By "
-"holding shift- or ctrl- and clicking on other module names you can select "
-"more than one. Then follow the same procedure to open the search dialog. You "
-"will be searching in all of these Documents."
-msgstr ""
-
-#: index.docbook:213
-#, no-c-format
-msgid "Using the Search Dialog"
-msgstr ""
-
-#: index.docbook:214
-#, no-c-format
-msgid ""
-"&bibletime; provides a well developed search facility based on "
-"<application>GCC Regular Expression</application>. It allows you to create "
-"almost <link linkend=\"hdbk-op-search-dialog-text-regexp\">any type of "
-"search you can imagine.</link>"
-msgstr ""
-
-#: index.docbook:218
-#, no-c-format
-msgid ""
-"To access the search feature, click with the <mousebutton>right</"
-"mousebutton> mouse button in the Main Index now in the drop down select the "
-"magnifying glass. You can also customize &bibletime; to put the search icon "
-"<inlinemediaobject> <imageobject> <imagedata fileref=\"find.png\" format="
-"\"PNG\"/> </imageobject> </inlinemediaobject> in the toolbar if you would "
-"prefer."
-msgstr ""
-
-#: index.docbook:230
-#, no-c-format
-msgid "The Options Tab - Setting up your search."
-msgstr ""
-
-#: index.docbook:231
-#, no-c-format
-msgid "Use the options tab to set up your search."
-msgstr ""
-
-#: index.docbook:232
-#, no-c-format
-msgid "Search Text Dialog Options Tab"
-msgstr ""
-
-#: index.docbook:243
-#, no-c-format
-msgid "Using the Choose Modules Button"
-msgstr ""
-
-#: index.docbook:244
-#, no-c-format
-msgid ""
-"At the top of the options tab you will find <guibutton>Choose Modules</"
-"guibutton> , with the already selected modules directly below. If you would "
-"like to search additional modules, click on <guibutton>Choose Modules</"
-"guibutton> and you will be offered a menu of all of the modules that can be "
-"searched. Select modules with a click in the checkbox, then click the "
-"<guibutton>Use Selected Modules</guibutton> button."
-msgstr ""
-
-#: index.docbook:250
-#, no-c-format
-msgid "Choose Modules Dialog Box"
-msgstr ""
-
-#: index.docbook:261
-#, no-c-format
-msgid "Searched Text - what you want to find."
-msgstr ""
-
-#: index.docbook:263
-#, no-c-format
-msgid ""
-"The text box labled Searched Text is where the phrase to be used as the "
-"search key is entered. This phrase may be one or more words, or partial "
-"words, (separate words, or partials, with a space), a phrase, or pattern "
-"<link linkend=\"hdbk-op-search-dialog-text-regexp\">(Regular Expression).</"
-"link> You can use the radio buttons select to perform the search using the "
-"search key in multiple word, exact search, or regular expression mode. A "
-"check box is provided to turn case sensitive search on or off."
-msgstr ""
-
-#: index.docbook:274
-#, no-c-format
-msgid ""
-"Drag &amp; Drop Works Here, you can drop verses and bookmarks into the text "
-"box. You can also copy and paste text into the text box."
-msgstr ""
-
-#: index.docbook:279
-#, no-c-format
-msgid "Using the Search Text Case Sensitive checkbox"
-msgstr ""
-
-#: index.docbook:280
-#, no-c-format
-msgid ""
-"Click on the Case Sensitive check box to toggle case sensitivity on or off. "
-"If the box is marked a search will only find verse in which the found text "
-"also matches the case of the text in the input field. If the box is unmarked "
-"the search will match if the texts match but are different in case. To "
-"locate &quot;LORD&quot; but not &quot;Lord&quot; or &quot;lord&quot; mark "
-"the check box. To let &quot;LORD&quot; and &quot;Lord&quot; match &quot;"
-"lord&quot; leave the check box unmarked."
-msgstr ""
-
-#: index.docbook:294
-#, no-c-format
-msgid "Using the Search Text Multiple Word (AND) Button"
-msgstr ""
-
-#: index.docbook:295
-#, no-c-format
-msgid ""
-"If Multiple Words (AND) radio button is marked the search will locate all "
-"lines (or verses) that have all the words, listed in the Input Field. The "
-"position and order of the words, in the line is not a factor. If all the "
-"words, are in a line, in any order, even separated by other words, the line "
-"will be included in the list of found lines. A search for &quot;prove "
-"cause&quot; will find Gen. 21:25, &quot;And Abraham re<emphasis>prove</"
-"emphasis>d Abimelech be <emphasis>cause</emphasis> of a well of water..."
-"&quot; This is because a word that is part of another word is considered "
-"found if a word containing it is found."
-msgstr ""
-
-#: index.docbook:308
-#, no-c-format
-msgid "Using the Search Text Multiple Word (OR) Button"
-msgstr ""
-
-#: index.docbook:309
-#, no-c-format
-msgid ""
-"If Multiple Words (OR) radio button is marked the search will locate all "
-"lines (or verses) that have any of the words, listed in the Input Field. A "
-"search for &quot;cause&quot; will find Genesis 21:11, &quot;And the thing "
-"was very grievous in Abraham's sight be<emphasis>cause </emphasis> of his "
-"son.&quot;"
-msgstr ""
-
-#: index.docbook:317
-#, no-c-format
-msgid "Using the Exact Search"
-msgstr ""
-
-#: index.docbook:318
-#, no-c-format
-msgid ""
-"If the Exact radio button is marked the search will locate all lines (or "
-"verses) that contain what was entered in the input field, exactly as "
-"entered, including any spaces. The phrase found does not have to start or "
-"end at a word boundary. A search for &quot;now how thou ought&quot; will "
-"find 1 Timothy 3:1, &quot;...that thou mayest k<emphasis>now how thou ought</"
-"emphasis>est to behave...&quot;"
-msgstr ""
-
-#: index.docbook:329
-#, no-c-format
-msgid "<guibutton>Choose Search</guibutton> Scope Options"
-msgstr ""
-
-#: index.docbook:330
-#, no-c-format
-msgid ""
-"Define the Scope of your search by clicking on the <guibutton>Choose Scope</"
-"guibutton> button. You will be presented a list of predefined scopes."
-msgstr ""
-
-#: index.docbook:333
-#, no-c-format
-msgid ""
-"<guibutton>No Scope</guibutton> this turns off the search scope tab. The "
-"entire document is searched."
-msgstr ""
-
-#: index.docbook:333
-#, no-c-format
-msgid ""
-"<guibutton>Last Result</guibutton> The new search will only search within "
-"the verses found in the previous search."
-msgstr ""
-
-#: index.docbook:333
-#, no-c-format
-msgid ""
-"<guibutton>Gospels</guibutton> The new search will be performed within the "
-"range Matthew 1:1 - John 21:25"
-msgstr ""
-
-#: index.docbook:333
-#, no-c-format
-msgid ""
-"<guibutton>History</guibutton> The new search will be performed within the "
-"range Joshua 1:1 - Esther 10:3;"
-msgstr ""
-
-#: index.docbook:344
-#, no-c-format
-msgid ""
-"If <guibutton>No Scope</guibutton> is checked and a search of the KJV Bible "
-"module is done for the name, Jesus, 939 matches will result. Then if "
-"<guibutton>Last Result</guibutton> is checked and another search is done for "
-"the title, Christ, 257 matches from the first 939 matches will remain. Then "
-"if <guibutton>Last Result</guibutton> remains checked and another search is "
-"done for the title, Lord, 106 matches from the 257 will remain. All the "
-"remaining 106 matches will have the name, Jesus, and both the titles, Christ "
-"and Lord."
-msgstr ""
-
-#: index.docbook:354
-#, no-c-format
-msgid "Edit Ranges"
-msgstr ""
-
-#: index.docbook:355
-#, no-c-format
-msgid ""
-"Setup Custom Ranges - You can enter upper and lower boundaries for the "
-"search by clicking on the <guibutton>Setup Custom Ranges</guibutton> button."
-msgstr ""
-
-#: index.docbook:358
-#, no-c-format
-msgid "Change Range Entry Box"
-msgstr ""
-
-#: index.docbook:367
-#, no-c-format
-msgid "The predefined ranges show examples of the required syntax."
-msgstr ""
-
-#: index.docbook:369
-#, no-c-format
-msgid ""
-"Click on the <guibutton>Add New Range</guibutton> enter the name for your "
-"range in the Name text entry box, and enter the range in the text entry box "
-"labled Edit the search range. Your range is now added to the list of custom "
-"ranges. If you are satisfied you can return to the Search Options tab by "
-"clicking on <guibutton>OK</guibutton>."
-msgstr ""
-
-#: index.docbook:376
-#, no-c-format
-msgid "A number of custom ranges have been provided."
-msgstr ""
-
-#: index.docbook:378
-#, no-c-format
-msgid ""
-"The scope of a search can be set to the <emphasis>Entire Module</emphasis> "
-"or the <emphasis>Current Results.</emphasis> If Entire Module is checked and "
-"a search of the KJV Bible module is done for the name, Jesus, 939 matches "
-"will result. Then if Current Results is checked and another search is done "
-"for the title, Christ, 257 matches from the first 939 matches will remain. "
-"Then if Current Results remains checked and another search is done for the "
-"title, Lord, 106 matches from the 257 will remain. All the remaining 106 "
-"matches will have the name, Jesus, and both the titles, Christ and Lord."
-msgstr ""
-
-#: index.docbook:394
-#, no-c-format
-msgid "Search TextCustom Range Dialog Box"
-msgstr ""
-
-#: index.docbook:405
-#, no-c-format
-msgid "Using the Search Text Button"
-msgstr ""
-
-#: index.docbook:406
-#, no-c-format
-msgid "Click on the <guibutton>Search Button</guibutton> to start the search."
-msgstr ""
-
-#: index.docbook:408
-#, no-c-format
-msgid "Search Text Dialog Box"
-msgstr ""
-
-#: index.docbook:420
-#, no-c-format
-msgid "The Search Results Tab"
-msgstr ""
-
-#: index.docbook:421
-#, no-c-format
-msgid "Under the search results tab you will find the all of your search hits."
-msgstr ""
-
-#: index.docbook:425
-#, no-c-format
-msgid "Using the Search Results Tab"
-msgstr ""
-
-#: index.docbook:426
-#, no-c-format
-msgid ""
-"Search Result - This tells you first, by module, how many instances of the "
-"search string were found. In the Module Column, clicking on a document will "
-"open the list of references (clicking with the <mousebutton>right</"
-"mousebutton> mouse button allows you to copy, save, or print the list of "
-"items found). Clicking on a reference (the found items list) opens that "
-"verse up in the window below. Drag the reference and drop it on a document "
-"in the main index to open the module to that verse in a new display window, "
-"or look at the verse in the bottom pane of the search results tab."
-msgstr ""
-
-#: index.docbook:435
-#, no-c-format
-msgid "Drag &amp; Drop Works Here in the text display area."
-msgstr ""
-
-#: index.docbook:437
-#, no-c-format
-msgid ""
-"Select verse numbers and drag them to the main index to create bookmarks."
-msgstr ""
-
-#: index.docbook:438
-#, no-c-format
-msgid ""
-"Select verse numbers and drop them on an unopened module in the main index "
-"to open the module and jump to the verse location (Bibles and commentaries "
-"only)."
-msgstr ""
-
-#: index.docbook:440
-#, no-c-format
-msgid ""
-"Select verse numbers and drag them to an open document and the document will "
-"jump to the verse location (Bibles and commentaries only)."
-msgstr ""
-
-#: index.docbook:443
-#, no-c-format
-msgid "Search Result Dialog Box"
-msgstr ""
-
-#: index.docbook:455
-#, no-c-format
-msgid "Using the Search Analysis"
-msgstr ""
-
-#: index.docbook:456
-#, no-c-format
-msgid ""
-"Click on <guibutton>Search Analysis</guibutton> to open the search analysis "
-"display."
-msgstr ""
-
-#: index.docbook:457
-#, no-c-format
-msgid ""
-"<guibutton>Search Analysis</guibutton> - This gives a graphic analysis of "
-"the number of instances the search string was found in each book. It can "
-"display results for all documents searched. You have the option of saving "
-"the analysis as an html formated list on your hard drive."
-msgstr ""
-
-#: index.docbook:462
-#, no-c-format
-msgid "Search Analysis Dialog Box"
-msgstr ""
-
-#: index.docbook:477
-#, no-c-format
-msgid "Search Syntax using GCC Regular Expression"
-msgstr ""
-
-#: index.docbook:479
-#, no-c-format
-msgid ""
-"Regular expression searches provide a way to do simple or complex searches "
-"for strings that match a pattern or set of patterns (branches) separated by "
-"vertical bars &quot;|&quot;. While a pattern can be built to look for a word "
-"or phrase, a simple pattern that consists of a word does not look for only "
-"that word but for any place the string of letters that make that word are "
-"found. A search for &quot;right&quot; will return verses that contain the "
-"word &quot;right&quot;, but also &quot;<emphasis>right</emphasis>eous&quot;, "
-"&quot;<emphasis>right</emphasis>eousness&quot;, &quot;un<emphasis>right</"
-"emphasis>eous&quot;, &quot;up<emphasis>right</emphasis>&quot; and even &quot;"
-"b<emphasis>right</emphasis>&quot;. A search for &quot;hall not&quot; is not "
-"a search for &quot;hall&quot; AND &quot;not&quot; but for the string &quot;"
-"hall not&quot; with a space between the second &quot;l&quot; and the &quot;"
-"n&quot;. The search for &quot;hall not&quot; will find occurrences of &quot;"
-"s<emphasis>hall not</emphasis>&quot;."
-msgstr ""
-
-#: index.docbook:495
-#, no-c-format
-msgid ""
-"The power of Regular Expressions is in the patterns (or templates) used to "
-"define a search. A pattern consists of ordinary characters and some special "
-"characters that are used and interpreted by a set of rules. Special "
-"characters include .\\[^*$?+. Ordinary (or simple) characters are any "
-"characters that are not special. The backslash, &quot;\\&quot;, is used to "
-"convert special characters to ordinary and ordinary characters to special."
-msgstr ""
-
-#: index.docbook:504
-#, no-c-format
-msgid ""
-"Example: the pattern &quot;<emphasis>i. love\\.</emphasis>&quot; will find "
-"sentences that end with &quot;h<emphasis>i</emphasis>s <emphasis>love</"
-"emphasis>&quot; or &quot;<emphasis>i</emphasis>n <emphasis>love</"
-"emphasis>&quot; or &quot;<emphasis>i</emphasis>s <emphasis>love</"
-"emphasis>&quot; followed by a period. The first period in &quot;i. love\\."
-"&quot; is a special character that means allow any character in this "
-"position. The backslash in &quot;i. love\\.&quot; means that the period "
-"following it is not to be considered a special character, but is an ordinary "
-"period."
-msgstr ""
-
-#: index.docbook:515
-#, no-c-format
-msgid "Rules for GCC Regular Expression Search Requests"
-msgstr ""
-
-#: index.docbook:516
-#, no-c-format
-msgid ""
-". The period matches any character. See <link linkend=\"period\">Details</"
-"link>"
-msgstr ""
-
-#: index.docbook:516
-#, no-c-format
-msgid ""
-"* The asterisk matches 0 or more characters of the preceding: set, character "
-"or indicated character. See <link linkend=\"asterisk\">Details</link>"
-msgstr ""
-
-#: index.docbook:516
-#, no-c-format
-msgid ""
-"+ The plus sign matches 1 or more characters of the preceding: set, "
-"character or indicated character. See <link linkend=\"plus\">Details</link>"
-msgstr ""
-
-#: index.docbook:516
-#, no-c-format
-msgid ""
-"? The question mark matches 0 or 1 character of the preceding: set, "
-"character or indicated character. See <link linkend=\"question\">Details</"
-"link>"
-msgstr ""
-
-#: index.docbook:516
-#, no-c-format
-msgid ""
-"[ ] Square brackets match any one of the characters specified inside [ ]. "
-"See <link linkend=\"bracket\">Details</link>"
-msgstr ""
-
-#: index.docbook:516
-#, no-c-format
-msgid ""
-"^ A caret as the first character inside [ ] means NOT. See <link linkend="
-"\"caret\">Details</link>"
-msgstr ""
-
-#: index.docbook:516
-#, no-c-format
-msgid ""
-"^ A caret beginning a pattern anchors the beginning of a line. See <link "
-"linkend=\"caret\">Details</link>"
-msgstr ""
-
-#: index.docbook:516
-#, no-c-format
-msgid ""
-"$ A dollar at the end of a pattern anchors the end of a line. See <link "
-"linkend=\"dollar\">Details</link>"
-msgstr ""
-
-#: index.docbook:516
-#, no-c-format
-msgid ""
-"| A vertical bar means logical OR. See <link linkend=\"bar\">Details</link>"
-msgstr ""
-
-#: index.docbook:516
-#, no-c-format
-msgid ""
-"( ) Parentheses enclose expressions for grouping. <emphasis>Not supported!</"
-"emphasis>"
-msgstr ""
-
-#: index.docbook:516
-#, no-c-format
-msgid ""
-"\\ A backslash can be used prior to any special character to match that "
-"character. See <link linkend=\"backslash\">Details</link>"
-msgstr ""
-
-#: index.docbook:516
-#, no-c-format
-msgid ""
-"\\ A backslash can be used prior to an ordinary character to make it a "
-"special character. See <link linkend=\"backslash\">Details</link>"
-msgstr ""
-
-#: index.docbook:547
-#, no-c-format
-msgid "The Period ."
-msgstr ""
-
-#: index.docbook:549
-#, no-c-format
-msgid ""
-"The Period &quot;.&quot; will match any single character even a space or "
-"other non-alphabet character. <emphasis>s.t</emphasis> matches <emphasis>s</"
-"emphasis>i<emphasis>t</emphasis>, <emphasis>s</emphasis>e<emphasis>t</"
-"emphasis>,<emphasis> s</emphasis>o<emphasis>t</emphasis>, etc., which could "
-"be located in <emphasis>s</emphasis>i<emphasis>t</emphasis>ting, "
-"compas<emphasis>s</emphasis>e<emphasis>t</emphasis>h and <emphasis>s</"
-"emphasis>o<emphasis>t</emphasis>tish <emphasis>b..t</emphasis> matches "
-"<emphasis>b</emphasis>oo<emphasis>t</emphasis>, <emphasis>b</"
-"emphasis>oa<emphasis>t</emphasis> and <emphasis>b</emphasis>ea<emphasis>t "
-"foot.tool </emphasis>matches <emphasis>foot</emphasis>s<emphasis>tool </"
-"emphasis>and <emphasis>foot tool</emphasis>"
-msgstr ""
-
-#: index.docbook:563
-#, no-c-format
-msgid "The Asterisk *"
-msgstr ""
-
-#: index.docbook:565
-#, no-c-format
-msgid ""
-"The asterisk matches zero or more characters of the preceding: set, "
-"character or indicated character. Using a period asterisk combination &quot;."
-"*&quot; after a commonly found pattern can cause the search to take a very "
-"long time, making the program seem to freeze. <emphasis>be*n</emphasis> "
-"matches<emphasis> beeen, been, ben</emphasis>, and <emphasis>bn</emphasis> "
-"which could locate Reu<emphasis>ben</emphasis> and She<emphasis>bn</"
-"emphasis>a."
-msgstr ""
-
-#: index.docbook:577
-#, no-c-format
-msgid "The Plus Sign +"
-msgstr ""
-
-#: index.docbook:578
-#, no-c-format
-msgid ""
-"The Plus Sign matches one or more characters of the preceding: set, "
-"character or indicated character. Using a period and plus sign combination "
-"&quot;.+&quot; after a commonly found pattern can cause the search to take a "
-"very long time, making the program seem to freeze. <emphasis>be+n</emphasis> "
-"matches <emphasis>beeen, been</emphasis> and <emphasis>ben</emphasis>, but "
-"not <emphasis>bn</emphasis>."
-msgstr ""
-
-#: index.docbook:589
-#, no-c-format
-msgid "The Question Mark ?"
-msgstr ""
-
-#: index.docbook:590
-#, no-c-format
-msgid ""
-"The Question Mark matches zero or one character of the preceding: set, "
-"character or indicated character. <emphasis>be?n</emphasis> matches "
-"<emphasis>ben</emphasis> and <emphasis>bn</emphasis> but not <emphasis>been</"
-"emphasis>. <emphasis>trees?</emphasis> matches <emphasis>trees</emphasis> or "
-"<emphasis>tree</emphasis>."
-msgstr ""
-
-#: index.docbook:599
-#, no-c-format
-msgid "The Square Brackets [ ]"
-msgstr ""
-
-#: index.docbook:600
-#, no-c-format
-msgid ""
-"The Square Brackets enclose a set of characters that can match. The period, "
-"asterisk, plus sign and question mark are not special inside the brackets. A "
-"minus sign can be used to indicate a range. If you want a caret &quot;"
-"^&quot; to be part of the range do not place it first after the left bracket "
-"or it will be a special character. To include a &quot;]&quot; in the set "
-"make it the first (or second after a special &quot;^&quot;) character in the "
-"set. To include a minus sign in the set make it the first (or second after a "
-"special &quot;^&quot;) or last character in the set. <emphasis>s[eia]t</"
-"emphasis> matches <emphasis>set</emphasis>, <emphasis>sit</emphasis>, and "
-"<emphasis>sat</emphasis>, but not <emphasis>s</emphasis>o<emphasis>t</"
-"emphasis>. <emphasis>s[eia]+t </emphasis>matches as above but also, "
-"<emphasis>seat, seet, siet</emphasis>, etc. <emphasis>[a-d]</emphasis> "
-"matches <emphasis>a, b, c,</emphasis> or <emphasis>d</emphasis>. <emphasis>"
-"[A-Z]</emphasis> matches any uppercase letter. [.;:?!] matches ., ;, :, ?, "
-"or ! but not a comma. [ ]^-] matches ] or ^ or -"
-msgstr ""
-
-#: index.docbook:622
-#, no-c-format
-msgid "The Caret first in Square Brackets [^xxx"
-msgstr ""
-
-#: index.docbook:623
-#, no-c-format
-msgid ""
-"If the Caret is the first character after the left bracket it means NOT. "
-"<emphasis>s[^io]t</emphasis> matches <emphasis>set, sat</emphasis>, etc., "
-"but not <emphasis>s</emphasis>i<emphasis>t</emphasis> and <emphasis>s</"
-"emphasis>o<emphasis>t</emphasis>."
-msgstr ""
-
-#: index.docbook:630
-#, no-c-format
-msgid "The Caret as Start of Line Anchor ^xxx"
-msgstr ""
-
-#: index.docbook:631
-#, no-c-format
-msgid ""
-"If the Caret is the first character in a pattern it anchors the pattern to "
-"the start of a line. Any match must be at the beginning of a line. Because "
-"of unfiltered formatting characters in some texts, this feature does not "
-"always work, but may if a few periods are placed after the caret to account "
-"for the formatting characters. <emphasis>^In the beginning</emphasis> "
-"matches lines that start with &quot;<emphasis>In the beginning</"
-"emphasis>&quot;. (May need to use: <emphasis>^.....In the beginning</"
-"emphasis>)"
-msgstr ""
-
-#: index.docbook:644
-#, no-c-format
-msgid "The Dollar Sign as End of Line Anchor xxx$"
-msgstr ""
-
-#: index.docbook:645
-#, no-c-format
-msgid ""
-"If the Dollar Sign is the last character in a pattern it anchors the pattern "
-"to the end of a line. Any match must be at the end of a line. Because of "
-"unfiltered formatting characters in some texts, this feature does not always "
-"work, but may if a few periods are placed before the dollar sign to account "
-"for the formatting characters. <emphasis>Amen\\.$</emphasis> matches lines "
-"that end with &quot;<emphasis>Amen.</emphasis>&quot; (May need to use Amen"
-"\\....$, Amen\\..........$, or even Amen\\....................$)"
-msgstr ""
-
-#: index.docbook:659
-#, no-c-format
-msgid "The Vertical Bar |"
-msgstr ""
-
-#: index.docbook:660
-#, no-c-format
-msgid ""
-"The Vertical Bar between patterns means OR. <emphasis>John|Peter</emphasis> "
-"matches <emphasis>John</emphasis> or <emphasis>Peter. John .*Peter|Peter ."
-"*John</emphasis> matches <emphasis>John</emphasis> ... <emphasis>Peter</"
-"emphasis> or <emphasis>Peter</emphasis> ... <emphasis>John</emphasis>. (.* "
-"slows a search) <emphasis>pain|suffering|sorrow</emphasis> matches "
-"<emphasis>pain</emphasis>, or <emphasis>suffering</emphasis>, or "
-"<emphasis>sorrow</emphasis>."
-msgstr ""
-
-#: index.docbook:671
-#, no-c-format
-msgid "The Parentheses ( )"
-msgstr ""
-
-#: index.docbook:672
-#, no-c-format
-msgid "The use of Parentheses ( ) is not supported!"
-msgstr ""
-
-#: index.docbook:678
-#, no-c-format
-msgid "The Backslash Prior to a Special Character \\*"
-msgstr ""
-
-#: index.docbook:679
-#, no-c-format
-msgid ""
-"The Backslash prior to a special character indicates that the character is "
-"not being used in its special meaning, but is just to match itself. "
-"<emphasis>amen\\.</emphasis> matches <emphasis>amen.</emphasis> but not "
-"<emphasis>amen</emphasis>t and will not locate firm<emphasis>amen</"
-"emphasis>t."
-msgstr ""
-
-#: index.docbook:687
-#, no-c-format
-msgid "The Backslash Prior to an Ordinary Character \\s"
-msgstr ""
-
-#: index.docbook:689
-#, no-c-format
-msgid ""
-"The Backslash prior to an ordinary character indicates that the character is "
-"not being used to match itself, but has special meaning."
-msgstr ""
-
-#: index.docbook:693
-#, no-c-format
-msgid ""
-"\\b if use outside [ ] means word boundary. If used inside [ ] means "
-"backspace. <emphasis>\\brighteous\\b</emphasis> matches <emphasis>righteous</"
-"emphasis> but not un<emphasis>righteous</emphasis> or <emphasis>righteous</"
-"emphasis>ness"
-msgstr ""
-
-#: index.docbook:693
-#, no-c-format
-msgid ""
-"\\B means non-word boundary. <emphasis>\\Brighteous\\B</emphasis> matches "
-"un<emphasis>righteous</emphasis>ness and un<emphasis>righteous</emphasis>ly "
-"but not <emphasis>righteous</emphasis>, un<emphasis>righteous</emphasis> or "
-"<emphasis> righteous</emphasis>ness."
-msgstr ""
-
-#: index.docbook:693
-#, no-c-format
-msgid "\\d means digit; same as [0-9]."
-msgstr ""
-
-#: index.docbook:693
-#, no-c-format
-msgid "\\D means non-digit, same as [^0-9]."
-msgstr ""
-
-#: index.docbook:693
-#, no-c-format
-msgid "\\s means space."
-msgstr ""
-
-#: index.docbook:693
-#, no-c-format
-msgid "\\S means not a space."
-msgstr ""
-
-#: index.docbook:693
-#, no-c-format
-msgid "\\w means alphanumeric; same as [a-zA-Z0-9_]."
-msgstr ""
-
-#: index.docbook:693
-#, no-c-format
-msgid "\\W means not alphanumeric; same as [^a-zA-Z0-9_]."
-msgstr ""
-
-#: index.docbook:714
-#, no-c-format
-msgid "Exporting and Printing"
-msgstr ""
-
-#: index.docbook:715
-#, no-c-format
-msgid "Bible Window, Lexicon Window, Commentary Window, Book Window."
-msgstr ""
-
-#: index.docbook:716
-#, no-c-format
-msgid ""
-"By clicking with the <mousebutton>right</mousebutton> mouse button on the "
-"index key number, verse number or text the Bible Window, Lexicon Window, "
-"Commentary Window or Book Window drop down box is displayed (depending on "
-"which kind of window is current), providing options to select all, and the "
-"export options copy, add to printing queue, and save."
-msgstr ""
-
-#: index.docbook:723
-#, no-c-format
-msgid "Select All"
-msgstr ""
-
-#: index.docbook:724
-#, no-c-format
-msgid ""
-"A mouse click here will select all of the text in the chapter displayed in "
-"the current window."
-msgstr ""
-
-#: index.docbook:730
-#, no-c-format
-msgid "Copy"
-msgstr ""
-
-#: index.docbook:731
-#, no-c-format
-msgid ""
-"A mouse click here will bring up a sub menu offering to copy to the copy "
-"buffer using the current location of the cursor as the starting point."
-msgstr ""
-
-#: index.docbook:734
-#, no-c-format
-msgid ""
-"<guimenuitem>Reference only</guimenuitem> - The number of the current verse "
-"(such as Genesis 1:25)."
-msgstr ""
-
-#: index.docbook:734
-#, no-c-format
-msgid ""
-"<guimenuitem>Text of Reference</guimenuitem> - The text of the current verse."
-msgstr ""
-
-#: index.docbook:734
-#, no-c-format
-msgid ""
-"<guimenuitem>Reference with Text</guimenuitem> - Both the text of the "
-"current verse, and the verse number."
-msgstr ""
-
-#: index.docbook:734
-#, no-c-format
-msgid "<guimenuitem>Chapter</guimenuitem> - the entire chapter."
-msgstr ""
-
-#: index.docbook:734
-#, no-c-format
-msgid ""
-"<guimenuitem>Selected Text</guimenuitem> - Only the selected (highlighted) "
-"text."
-msgstr ""
-
-#: index.docbook:761
-#, no-c-format
-msgid ""
-"This text can be copied into any application that can access the linux copy "
-"buffer."
-msgstr ""
-
-#: index.docbook:766
-#, no-c-format
-msgid "Add to Printing Queue"
-msgstr ""
-
-#: index.docbook:767
-#, no-c-format
-msgid ""
-"Selecting print here puts your print output in the bibletime print buffer. "
-"Inorder to send your job to the printer (lpr) via kprinter, you must select "
-"<guimenu>file</guimenu> <guimenuitem>print</guimenuitem> on the "
-"<guilabel>menubar</guilabel>."
-msgstr ""
-
-#: index.docbook:775
-#, no-c-format
-msgid "A mouse click here will bring up a submenu with the printing options:"
-msgstr ""
-
-#: index.docbook:777
-#, no-c-format
-msgid "reference with text"
-msgstr ""
-
-#: index.docbook:777
-#, no-c-format
-msgid "chapter"
-msgstr ""
-
-#: index.docbook:789
-#, no-c-format
-msgid ""
-"Selecting these places text into the bibletime print queue, but it will not "
-"print yet. When all of the items that you desire to print are copied to the "
-"print queue, select the print icon and the print dialog window is displayed. "
-"Now you can select to either view or print the text."
-msgstr ""
-
-#: index.docbook:795
-#, no-c-format
-msgid ""
-"Printing from &bibletime; is rather basic and is intended as a utility. If "
-"you are composing a document or presentation containing text from "
-"&bibletime; documents, we suggest that you use one of the presentation or "
-"editing tools on your system to format your work."
-msgstr ""
-
-#: index.docbook:802
-#, no-c-format
-msgid "Save"
-msgstr ""
-
-#: index.docbook:803
-#, no-c-format
-msgid "A mouse click here will bring up a submenu with save options:"
-msgstr ""
-
-#: index.docbook:805
-#, no-c-format
-msgid ""
-"<guimenuitem>Verse with reference</guimenuitem> - a file is created in "
-"&UNIX; formated ASCII text."
-msgstr ""
-
-#: index.docbook:805
-#, no-c-format
-msgid ""
-"<guimenuitem>Chapter as plain text</guimenuitem> - a file is created in "
-"&UNIX; formated ASCII text."
-msgstr ""
-
-#: index.docbook:805
-#, no-c-format
-msgid ""
-"<guimenuitem>Chapter as HTML</guimenuitem> - a file is created formated in "
-"HTML."
-msgstr ""
-
-#: index.docbook:822
-#, no-c-format
-msgid ""
-"Once saved this text can be opened and edited by any text or HTML "
-"application."
-msgstr ""
-
-#: index.docbook:1
-#, no-c-format
-msgid "Starting &bibletime;"
-msgstr ""
-
-#: index.docbook:3
-#, no-c-format
-msgid ""
-"&bibletime; is a &kde; program and is integrated with the &kde; desktop. You "
-"can launch &bibletime; from the &kde; <guimenu>start menu</guimenu> in the "
-"applications group."
-msgstr ""
-
-#: index.docbook:3
-#, no-c-format
-msgid "Icon used to start &bibletime;"
-msgstr ""
-
-#: index.docbook:18
-#, no-c-format
-msgid ""
-"&bibletime; can also be launched from a terminal command prompt. To launch "
-"&bibletime; open a terminal (any Xterminal inside a &kde;3 session) and type "
-"<command>bibletime</command>."
-msgstr ""
-
-#: index.docbook:24
-#, no-c-format
-msgid "Other Window Managers (not &kde;)"
-msgstr ""
-
-#: index.docbook:26
-#, no-c-format
-msgid ""
-"&bibletime; can be launched from inside other window managers (like gnome) "
-"providing &kde; is installed. You will need to install your own icon to "
-"launch the program. See the window manager help files to see how."
-msgstr ""
-
-#: index.docbook:33
-#, no-c-format
-msgid ""
-"&bibletime; can be used with other window managers such as Gnome, BlackBox, "
-"Sawfish, providing &kde;3 is already installed on your computer. If you "
-"installed &kde;3 using the &Linux-Mandrake; 8.x RPM's from a terminal using "
-"the mandrake RPM's KDE3 is installed in /opt, so the start up command in a "
-"terminal is:"
-msgstr ""
-
-#: index.docbook:38
-#, no-c-format
-msgid ""
-"export KDEDIR=/opt/kde3\n"
-"bibletime"
-msgstr ""
-
-#: index.docbook:42
-#, no-c-format
-msgid ""
-"&bibletime; will now open inside of a window of the current window manager. "
-"If you do not have &kde;3 installed in your copy of &Linux;, you should have "
-"tried the <ulink url=\"http://gnomesword.sourceforge.net/\">Gnomesword "
-"application.</ulink>, or one of the &kde;2 versions of &bibletime;."
-msgstr ""
-
-#: index.docbook:48
-#, no-c-format
-msgid ""
-"With &Linux-Mandrake; 9.0 and other other distributions where &kde; 3.x is "
-"installed in the normal location, simply type:"
-msgstr ""
-
-#: index.docbook:50 index.docbook:88
-#, no-c-format
-msgid "bibletime"
-msgstr ""
-
-#: index.docbook:55
-#, no-c-format
-msgid "Startup Customization"
-msgstr ""
-
-#: index.docbook:57
-#, no-c-format
-msgid ""
-"From a terminal you can use &bibletime; to open a random verse in the "
-"default bible:"
-msgstr ""
-
-#: index.docbook:59
-#, no-c-format
-msgid "bibletime --open-default-bible \"&lt;random&gt;\""
-msgstr ""
-
-#: index.docbook:63
-#, no-c-format
-msgid "To open at a given passage use:"
-msgstr ""
-
-#: index.docbook:64
-#, no-c-format
-msgid "bibletime --open-default-bible \"John 3:16\""
-msgstr ""
-
-#: index.docbook:70
-#, no-c-format
-msgid "You can also use keys in your current bookname language."
-msgstr ""
-
-#: index.docbook:75
-#, no-c-format
-msgid "Startup Sequence"
-msgstr ""
-
-#: index.docbook:76
-#, no-c-format
-msgid "As &bibletime; launches you may see some message screens:"
-msgstr ""
-
-#: index.docbook:78
-#, no-c-format
-msgid ""
-"<interface>No Modules Installed</interface> - This is shown if you have "
-"forgotten to install sword modules, or if the sword modules can not be found."
-msgstr ""
-
-#: index.docbook:78
-#, no-c-format
-msgid ""
-"<interface>First Time Startup</interface> - This is shown the first time "
-"&bibletime; is launched."
-msgstr ""
-
-#: index.docbook:78
-#, no-c-format
-msgid ""
-"<interface>Daily Tips</interface> - These show on every startup, unless you "
-"turn them off."
-msgstr ""
-
-#: index.docbook:78
-#, no-c-format
-msgid "Daily tips"
-msgstr ""
-
-#: index.docbook:108
-#, no-c-format
-msgid "Parts of the &bibletime; Window"
-msgstr ""
-
-#: index.docbook:109
-#, no-c-format
-msgid ""
-"Now the main &bibletime; window will open. It's operation is covered in the "
-"next chapter."
-msgstr ""
-
-#: index.docbook:109
-#, no-c-format
-msgid "The &bibletime; Application Window"
-msgstr ""
-
-#: index.docbook:1
-#, no-c-format
-msgid "Main toolbar and menubar"
-msgstr ""
-
-#: index.docbook:2
-#, no-c-format
-msgid "<para></para>"
-msgstr ""
-
-#: index.docbook:5
-#, no-c-format
-msgid "Toolbar"
-msgstr ""
-
-#: index.docbook:7
-#, no-c-format
-msgid ""
-"The action of each button is described in the configuration dialog box. "
-"<action>Moving the cursor over a button</action> will activate the button's "
-"tooltip which describes that buttons action."
-msgstr ""
-
-#: index.docbook:12
-#, no-c-format
-msgid "Button Action"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "view_sidetree.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Preferences Dialog</guilabel>, this icon opens the "
-"<guilabel>Manage sessions</guilabel> dialog. Here you can save a display for "
-"later recall."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "key_bindings.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Preferences Dialog</guilabel>, this icon opens the "
-"<guilabel>Accelerator</guilabel> dialog. Here you can customize the key "
-"bindings (keyboard shortcuts)."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "kcmfontinst.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Preferences Dialog</guilabel>, this icon opens the "
-"<guilabel>Choose Fonts</guilabel> dialog. Here you select the font used to "
-"display your sword modules."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "window_fullscreen.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Tool Bar</guilabel> this icon expands &bibletime; to use "
-"the entire viewing area of your monitor."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "ktip.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Tool Bar</guilabel> this icon opens the <guilabel>Daily "
-"Tip</guilabel>."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "configure.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Tool Bar</guilabel> this icon opens the <guilabel>Configure "
-"&bibletime;</guilabel> dialog."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "contents.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "In the <guilabel>Tool Bar</guilabel> this icon opens the Handbook."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "exit.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "In the <guilabel>Tool Bar</guilabel> this icon closes &bibletime;."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "fileclose.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Tool Bar</guilabel> this icon closes all open "
-"<guilabel>Document Windows</guilabel>."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "fileprint.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Tool Bar</guilabel> this icon opens the <guilabel>Print</"
-"guilabel> dialog. Right clicking in an <guilabel>Active Document Window</"
-"guilabel> and this symbol in a drop down menu sends the selected text to the "
-"print queue."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "find.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Main Index</guilabel> or the <guilabel>Tool Bar</guilabel> "
-"this icon opens the <guilabel>Search Dialog</guilabel>."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "bible_add.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Document Control Menu</guilabel> this icon opens the drop "
-"down menu that allows selection of an additional Bible Text."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "bible.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>main index</guilabel> this icon opens a Sword book module. "
-"This is used for modules that are not commentaries, lexicons or Bible texts."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "book_add.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Document Control Menu</guilabel> this icon opens the drop "
-"down menu that allows selection of an additional Sword book module. This is "
-"used for modules that are not commentaries, lexicons or Bible texts."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "book.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "In the <guilabel>main index</guilabel> this icon opens a Bible Text."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "cascade_auto.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Tool Bar</guilabel> this icon automatically cascades "
-"displayed books as they are opened."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "cascade.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Tool Bar</guilabel> this icon cascades the displayed books "
-"now."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "commentary_add.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Document Control Menu</guilabel> this icon opens the drop "
-"down menu that allows selection of an additional Lexicon."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "commentary.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "In the <guilabel>main index</guilabel> this icon opens a lexicon."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "displayconfig.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Preferences Dialog</guilabel>, this icon opens the "
-"<guilabel>Colors Dialog</guilabel>. Here you can change the colors of the "
-"displayed text.."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "lexicon_add.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "lexicon.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "startconfig.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Preferences Dialog</guilabel>, this icon opens the Startup "
-"Dialog. Here you can turn on (off) the tip of the day and the startup logo."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "swordconfig.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"<guimenuitem>Configure Sword</guimenuitem>. This icon is used in the "
-"<guilabel>Preferences Dialog</guilabel>. Here you can configure features "
-"controlled by the sword backend. Like default books, language used for book "
-"names, and various text display features."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "sync.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Tool Bar</guilabel> this icon links a commentary to the "
-"current open Bible. Thereafter the Commentary and the Bible scroll together."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "tile_auto.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Tool Bar</guilabel> this icon automatically tiles displayed "
-"books as they are opened."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "tile.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Tool Bar</guilabel> this icon tiles the displayed books now."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "bibletime.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"This icon is used with the desktop shortcut that launches &bibletime;. In "
-"the <guilabel>Tool Bar</guilabel> this icon displays the &bibletime; version "
-"information, license, and other interesting information."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "go.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Tool Bar</guilabel> this icon displays the &kde; version "
-"information, license, and other interesting information."
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "queue.png"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid ""
-"In the <guilabel>Tool Bar</guilabel> this icon will clear the print queue."
-msgstr ""
-
-#: index.docbook:464
-#, no-c-format
-msgid "Menubar"
-msgstr ""
-
-#: index.docbook:465
-#, no-c-format
-msgid ""
-"Various features of bibletime are accessed by way of drop down menus from "
-"the menubar."
-msgstr ""
-
-#: index.docbook:469
-#, no-c-format
-msgid "File"
-msgstr ""
-
-#: index.docbook:470
-#, no-c-format
-msgid "Clear printing queue"
-msgstr ""
-
-#: index.docbook:470
-#, no-c-format
-msgid ""
-"Clears all items from the &bibletime; print queue. The &bibletime; printing "
-"queue does not clear automatically."
-msgstr ""
-
-#: index.docbook:470
-#, no-c-format
-msgid "Print"
-msgstr ""
-
-#: index.docbook:470
-#, no-c-format
-msgid ""
-"This menu item launches the <guilabel>printdialog</guilabel> box. From here "
-"you will select print or view as for any other &kde; application."
-msgstr ""
-
-#: index.docbook:470
-#, no-c-format
-msgid "Closes &bibletime;."
-msgstr ""
-
-#: index.docbook:499
-#, no-c-format
-msgid "View"
-msgstr ""
-
-#: index.docbook:500
-#, no-c-format
-msgid "Show Toolbar"
-msgstr ""
-
-#: index.docbook:500
-#, no-c-format
-msgid ""
-"If <guimenuitem>show toolbar</guimenuitem> is selected, the toolbar is "
-"displayed. If <guimenuitem>show toolbar</guimenuitem> is unselected then the "
-"toolbar is hidden."
-msgstr ""
-
-#: index.docbook:500
-#, no-c-format
-msgid "Show Main Index"
-msgstr ""
-
-#: index.docbook:500
-#, no-c-format
-msgid ""
-"If <guimenuitem>show main index</guimenuitem> is selected, the left pane "
-"showing the available &sword; documents is displayed. If <guimenuitem>show "
-"main index</guimenuitem> is unselected then the left pane is hidden."
-msgstr ""
-
-#: index.docbook:527
-#, no-c-format
-msgid "Search"
-msgstr ""
-
-#: index.docbook:528
-#, no-c-format
-msgid "Search in default Bible"
-msgstr ""
-
-#: index.docbook:528
-#, no-c-format
-msgid ""
-"If <guimenuitem>Search in default Bible</guimenuitem> is selected, "
-"<guilabel>search dialog</guilabel> is displayed with the default Bible "
-"selected as the search parameter."
-msgstr ""
-
-#: index.docbook:528
-#, no-c-format
-msgid "Search in open module(s)"
-msgstr ""
-
-#: index.docbook:528
-#, no-c-format
-msgid ""
-"If <guimenuitem>Search in open module(s)</guimenuitem> is selected, "
-"<guilabel>search dialog</guilabel> is displayed with all of the open modules "
-"selected as the search parameters."
-msgstr ""
-
-#: index.docbook:554
-#, no-c-format
-msgid "Window"
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "Save session"
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "Saves the current configuration to a selected Session."
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "Save as new session"
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid ""
-"Saves the current configuration to a session, and allows the new session to "
-"be named."
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "Load session"
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid ""
-"Loads the contents of the named session to the current session of "
-"&bibletime;."
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "Configure sessions"
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid ""
-"This brings up the <guilabel>Sessions</guilabel> tab of the "
-"<guilabel>Preferences Dialog</guilabel>. Here you create and manage Sessions."
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "Fullscreen Mode"
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid ""
-"When <guimenuitem>Fullscreen Mode</guimenuitem> is selected, &bibletime; "
-"will expand to the full size of your monitor screen. To reverse the action "
-"select <guimenuitem>Fullscreen Mode</guimenuitem>again."
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "Cascades open display windows."
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "Tiles open display windows."
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "Automatically cascades newly opened display windows."
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "Ditto for tiling newly opened display windows."
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "Close all"
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "Closes all open display windows."
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid "List of open modules"
-msgstr ""
-
-#: index.docbook:555
-#, no-c-format
-msgid ""
-"Shows a list of all of the currently open modules. Selecting a module in "
-"this list makes that open module the selected module in the display area."
-msgstr ""
-
-#: index.docbook:637
-#, no-c-format
-msgid "Settings"
-msgstr ""
-
-#: index.docbook:638
-#, no-c-format
-msgid "Configure Toolbar"
-msgstr ""
-
-#: index.docbook:638
-#, no-c-format
-msgid "Show the <guilabel>Configure Toolbar</guilabel> dialog."
-msgstr ""
-
-#: index.docbook:638
-#, no-c-format
-msgid "Configure &bibletime;"
-msgstr ""
-
-#: index.docbook:638
-#, no-c-format
-msgid ""
-"Shows the <guilabel>Preferences Dialog</guilabel>. From this dialog the "
-"startup mode, fonts, colors, sessions, sword features, and accelerators are "
-"configurable."
-msgstr ""
-
-#: index.docbook:662
-#, no-c-format
-msgid "Help"
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid "Handbook"
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid ""
-"Select <guimenuitem>Handbook</guimenuitem> to access this document from the "
-"&kde; Help Center."
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid "Biblestudy HowTo"
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid ""
-"Select <guimenuitem>Biblestudy HowTo</guimenuitem> to access a good basic "
-"text with recommendations for studying the Bible."
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid "What's This"
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid "Allows you to click on certain items for contextual help."
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid "Bug Report"
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid ""
-"Send a bug report to the program's maintainers to help development. Before "
-"sending a bug report please configure the bug report application to use your "
-"mail program. This is done by <guibutton>configure</guibutton> on the "
-"<guilabel>Submit A Bug Report</guilabel> dialog."
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid "Daily Tip"
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid "Launches the <guilabel>tip of the day</guilabel> dialog."
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid "About &bibletime;"
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid "Opens a window with general &bibletime; information."
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid "About &kde;"
-msgstr ""
-
-#: index.docbook:663
-#, no-c-format
-msgid "Opens a window with general &kde; information."
-msgstr ""
-
-#: index.docbook:21
-#, no-c-format
-msgid "The &bibletime; Handbook"
-msgstr ""
-
-#: index.docbook:25
-#, no-c-format
-msgid ""
-"<firstname>Fred</firstname> <surname>Saalbach</surname> <affiliation> "
-"<address><email>info@bibletime.info</email></address> </affiliation>"
-msgstr ""
-
-#: index.docbook:33
-#, no-c-format
-msgid "<firstname>Jeffrey</firstname> <surname>Hoyt</surname>"
-msgstr ""
-
-#: index.docbook:40
-#, no-c-format
-msgid "ROLES_OF_TRANSLATORS"
-msgstr ""
-
-#: index.docbook:48
-#, no-c-format
-msgid "The team of &bibletime;, info@bibletime.info"
-msgstr ""
-
-#: index.docbook:53
-#, no-c-format
-msgid "The &bibletime; handbook is part of &bibletime;."
-msgstr ""
-
-#: index.docbook:56
-#, no-c-format
-msgid ""
-"&bibletime; 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."
-msgstr ""
-
-#: index.docbook:63
-#, no-c-format
-msgid ""
-"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."
-msgstr ""
-
-#: index.docbook:70
-#, no-c-format
-msgid ""
-"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."
-msgstr ""
-
-#: index.docbook:80
-#, no-c-format
-msgid "&bibletime; is an application to aid in study of the Bible."
-msgstr ""
-
-#: index.docbook:87
-#, no-c-format
-msgid "<keyword>KDE</keyword>"
-msgstr ""
-
-#: index.docbook:89
-#, no-c-format
-msgid "&bibletime;"
-msgstr ""
-
-#: index.docbook:90
-#, no-c-format
-msgid "sword"
-msgstr ""
-
-#: index.docbook:91
-#, no-c-format
-msgid "crosswire"
-msgstr ""
-
-#: index.docbook:92
-#, no-c-format
-msgid "help dialog"
-msgstr ""
diff --git a/pot/howto.pot b/pot/howto.pot
deleted file mode 100644
index 096f2c7..0000000
--- a/pot/howto.pot
+++ /dev/null
@@ -1,1558 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-02-09 01:25+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: application/x-xml2pot; charset=utf-8\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: index.docbook:1
-#, no-c-format
-msgid "Bible Study Basics"
-msgstr ""
-
-#: index.docbook:4
-#, no-c-format
-msgid "Our Purpose as we Approach the Bible"
-msgstr ""
-
-#: index.docbook:5
-#, no-c-format
-msgid ""
-"Jn.5:39-40<emphasis>\"You search the Scriptures, because you think that in "
-"them you have eternal life; and it is these that bear witness of Me; and you "
-"are unwilling to come to Me, that you may have life.\"</emphasis>"
-msgstr ""
-
-#: index.docbook:11
-#, no-c-format
-msgid ""
-"The chief purpose of the book is to bring us to the Person. Martin Luther "
-"said \"we go to the cradle only for the sake of the baby\"; just so in Bible "
-"study, we do it not for its own sake but for fellowship with God."
-msgstr ""
-
-#: index.docbook:17
-#, no-c-format
-msgid ""
-"The Jews to whom Jesus spoke... imagined that to possess Scripture was "
-"tantamount to possessing life. Hillel used to say, \"He who has gotten to "
-"himself words of Torah has gotten to himself the life of the world to come."
-"\" Their study was an end in itself. In this they were grievously "
-"deceived. ..."
-msgstr ""
-
-#: index.docbook:22
-#, no-c-format
-msgid ""
-"There is neither merit nor profit in the reading of Scripture for its own "
-"sake, but only if it effectively introduces us to Jesus Christ. Whenever the "
-"Bible is read, what is needed is an eager expectation that through it we may "
-"meet Christ."
-msgstr ""
-
-#: index.docbook:29
-#, no-c-format
-msgid "Approaches to God's Word"
-msgstr ""
-
-#: index.docbook:30
-#, no-c-format
-msgid ""
-"Hearing and reading provide a telescopic view of the scripture while study "
-"and memorization provide a microscopic view of scripture. Meditating on the "
-"scriptures brings hearing, reading, studying and memorization together and "
-"cements the word in our minds."
-msgstr ""
-
-#: index.docbook:36
-#, no-c-format
-msgid "Hear"
-msgstr ""
-
-#: index.docbook:37
-#, no-c-format
-msgid ""
-"Lk.11:28 <emphasis>\"blessed are those who hear the word of God, and observe "
-"it.\"</emphasis>"
-msgstr ""
-
-#: index.docbook:42
-#, no-c-format
-msgid "Read"
-msgstr ""
-
-#: index.docbook:42
-#, no-c-format
-msgid ""
-"Rev.1:3 <emphasis>\"Blessed is he who reads and those who hear the words of "
-"this prophecy...\"</emphasis>"
-msgstr ""
-
-#: index.docbook:45
-#, no-c-format
-msgid ""
-"1 Tim.4:13 <emphasis>\"give attention to the public reading of Scripture..."
-"\"</emphasis>"
-msgstr ""
-
-#: index.docbook:49 index.docbook:76
-#, no-c-format
-msgid "Study"
-msgstr ""
-
-#: index.docbook:50
-#, no-c-format
-msgid ""
-"Acts 17:11 <emphasis>\"Now these were more noble-minded than those in "
-"Thessalonica, for they received the word with great eagerness, examining the "
-"Scriptures daily, to see whether these things were so.\"</emphasis>"
-msgstr ""
-
-#: index.docbook:53
-#, no-c-format
-msgid ""
-"2 Tim.2:15 <emphasis>\"Be diligent [KJV `Study'] to present yourself "
-"approved to God as a workman who does not need to be ashamed, handling "
-"accurately the word of truth.\"</emphasis>"
-msgstr ""
-
-#: index.docbook:59
-#, no-c-format
-msgid "Memorize"
-msgstr ""
-
-#: index.docbook:60
-#, no-c-format
-msgid ""
-"Ps.119:11 <emphasis>\"Thy word I have hid in my heart, that I may not sin "
-"against Thee.\"</emphasis>"
-msgstr ""
-
-#: index.docbook:63
-#, no-c-format
-msgid "Meditate"
-msgstr ""
-
-#: index.docbook:64
-#, no-c-format
-msgid ""
-"Ps.1:2-3 <emphasis>\"But his delight is in the law of the Lord, And in His "
-"law he meditates day and night. And he will be like a tree firmly planted by "
-"streams of water, Which yields its fruit in its season, And its leaf does "
-"not wither; And in whatever he does, he prospers.\"</emphasis>"
-msgstr ""
-
-#: index.docbook:68
-#, no-c-format
-msgid ""
-"The Navigators illustrate this by saying that as the thumb can touch all the "
-"fingers, we can meditate on the Word as we do any of the first four. "
-"Meditation is a key to revelation. A new Christian needs to hear and read "
-"the Bible more than they need to study and memorize it. This is so that they "
-"become familiar with the overall message of the Bible."
-msgstr ""
-
-#: index.docbook:75
-#, no-c-format
-msgid "Types of Bible Studies"
-msgstr ""
-
-#: index.docbook:76
-#, no-c-format
-msgid "Topical Study"
-msgstr ""
-
-#: index.docbook:76
-#, no-c-format
-msgid ""
-"Pick out a certain topic and follow it through, using cross-references or a "
-"concordance."
-msgstr ""
-
-#: index.docbook:81
-#, no-c-format
-msgid "Character Study"
-msgstr ""
-
-#: index.docbook:82
-#, no-c-format
-msgid ""
-"Studying the life of a Bible character, e.g. Joseph's life in Gen.37-50."
-msgstr ""
-
-#: index.docbook:84
-#, no-c-format
-msgid "Expository Study"
-msgstr ""
-
-#: index.docbook:84
-#, no-c-format
-msgid "Studying a certain passage: paragraph, chapter, or book."
-msgstr ""
-
-#: index.docbook:89
-#, no-c-format
-msgid "Basics of Correct Interpretation"
-msgstr ""
-
-#: index.docbook:92
-#, no-c-format
-msgid "Content"
-msgstr ""
-
-#: index.docbook:93
-#, no-c-format
-msgid ""
-"What does it say? What does it say in the original language? Be careful with "
-"definitions. Don't read into it what it doesn't say."
-msgstr ""
-
-#: index.docbook:96
-#, no-c-format
-msgid "Context"
-msgstr ""
-
-#: index.docbook:97
-#, no-c-format
-msgid ""
-"What do the verses around it say? \"Context is king\" is the rule -- the "
-"passage must make sense within the structure of the entire passage and book."
-msgstr ""
-
-#: index.docbook:101
-#, no-c-format
-msgid "Cross-reference"
-msgstr ""
-
-#: index.docbook:102
-#, no-c-format
-msgid ""
-"What do other verses about this subject say through the rest of the Bible? "
-"God doesn't contradict Himself, so our interpretation needs to stand the "
-"test of other scriptures."
-msgstr ""
-
-#: index.docbook:107
-#, no-c-format
-msgid "An Expository Study of Matthew 6:1-18"
-msgstr ""
-
-#: index.docbook:109
-#, no-c-format
-msgid ""
-"Let's study together Mt.6:1-18. Read it to yourself, first looking for the "
-"key verse, the verse that sums up the whole passage. Think you have it? Test "
-"it by picking different places in the passage and asking yourself if they "
-"relate to the thought of the key verse. Once you find it, write it as Roman "
-"numeral One of your outline:"
-msgstr ""
-
-#: index.docbook:112
-#, no-c-format
-msgid "I. BEWARE OF PRACTICING YOUR RIGHTEOUSNESS BEFORE MEN TO BE NOTICED"
-msgstr ""
-
-#: index.docbook:115
-#, no-c-format
-msgid ""
-"What does \"practicing your righteousness\" mean? Does the passage give any "
-"examples? What area of our lives is being addressed? our motives! What sub-"
-"headings develop this thought?"
-msgstr ""
-
-#: index.docbook:117
-#, no-c-format
-msgid ""
-"A. WHEN YOU GIVE\n"
-"  B. WHEN YOU FAST\n"
-"  C. WHEN YOU PRAY"
-msgstr ""
-
-#: index.docbook:122
-#, no-c-format
-msgid ""
-"Now fill in the outline with specific instructions of how to avoid wrong "
-"ways of practicing our righteousness:"
-msgstr ""
-
-#: index.docbook:124
-#, no-c-format
-msgid ""
-"A. When you give\n"
-"     1. DON'T SOUND A TRUMPET.  (HOW MIGHT SOMEONE \"SOUND A TRUMPET\" "
-"TODAY?)\n"
-"     2. DO IT SECRETLY.\tETC."
-msgstr ""
-
-#: index.docbook:130
-#, no-c-format
-msgid "Worksheet: How to Use a Concordance"
-msgstr ""
-
-#: index.docbook:132
-#, no-c-format
-msgid "To Find a Particular Verse"
-msgstr ""
-
-#: index.docbook:133
-#, no-c-format
-msgid "Pick out a key word or most-unusual word of the verse."
-msgstr ""
-
-#: index.docbook:133
-#, no-c-format
-msgid "Turn to this word alphabetically."
-msgstr ""
-
-#: index.docbook:133
-#, no-c-format
-msgid "Go down the column of listings until you find your verse."
-msgstr ""
-
-#: index.docbook:138
-#, no-c-format
-msgid ""
-"Find these verses:\n"
-"\t\t\"Faithful are the wounds of a friend.\"\n"
-"\t\t\"We are ambassadors of Christ.\"\n"
-"\t\tThe story of the rich man and Lazarus."
-msgstr ""
-
-#: index.docbook:146
-#, no-c-format
-msgid "To Do a Topical Study"
-msgstr ""
-
-#: index.docbook:147
-#, no-c-format
-msgid ""
-"Let's say you wanted to do a study of the word \"redemption.\" First you "
-"would look up that word in the concordance and look up references listed for "
-"it. Then you could look up related words and references listed for them, e."
-"g. \"redeem, redeemed, ransom,\" even \"buy\" or \"bought.\""
-msgstr ""
-
-#: index.docbook:153
-#, no-c-format
-msgid "To Clarify Word Meanings in the Greek and Hebrew"
-msgstr ""
-
-#: index.docbook:154
-#, no-c-format
-msgid ""
-"What if you noticed a contradiction in the KJV between Mt.7:1 \"Judge not "
-"lest you be judged\" and 1 Cor.2:15 \"He that is spiritual judgeth all "
-"things.\" Maybe there are two different Greek words here, both being "
-"translated \"judge\" in English? (We're using Strong's from here out.)"
-msgstr ""
-
-#: index.docbook:157
-#, no-c-format
-msgid "Look up \"judge.\""
-msgstr ""
-
-#: index.docbook:157
-#, no-c-format
-msgid ""
-"Go down the column of entries to Mt.7:1. To the right is a number, 2919. "
-"This refers to the Greek word used. Write it down."
-msgstr ""
-
-#: index.docbook:157
-#, no-c-format
-msgid "Now look up \"judgeth.\""
-msgstr ""
-
-#: index.docbook:157
-#, no-c-format
-msgid "Go down the column to 1 Cor.2:15 . . . . . 350."
-msgstr ""
-
-#: index.docbook:157
-#, no-c-format
-msgid ""
-"Turn in the back to the Greek dictionary. (Remember, you're in the NT so the "
-"language is Greek, while the OT is Hebrew.) Compare the meaning of 2919 with "
-"the meaning of 350 and you have your answer!"
-msgstr ""
-
-#: index.docbook:168
-#, no-c-format
-msgid "To Find Meanings of Names"
-msgstr ""
-
-#: index.docbook:169
-#, no-c-format
-msgid ""
-"By the same process we can find the meaning of a name in the Greek or Hebrew."
-msgstr ""
-
-#: index.docbook:170
-#, no-c-format
-msgid "Look up these names and write down their meaning:"
-msgstr ""
-
-#: index.docbook:171
-#, no-c-format
-msgid "Nabal"
-msgstr ""
-
-#: index.docbook:171
-#, no-c-format
-msgid "Abigail"
-msgstr ""
-
-#: index.docbook:171
-#, no-c-format
-msgid "Joshua"
-msgstr ""
-
-#: index.docbook:171
-#, no-c-format
-msgid "Barnabus"
-msgstr ""
-
-#: index.docbook:1
-#, no-c-format
-msgid "Importance of God's Word"
-msgstr ""
-
-#: index.docbook:2
-#, no-c-format
-msgid ""
-"Understanding God's word is of great importance to all who call on God's "
-"name. Study of the Bible is one of the primary ways that we learn to "
-"communicate with God."
-msgstr ""
-
-#: index.docbook:6
-#, no-c-format
-msgid "A Book that is Unique"
-msgstr ""
-
-#: index.docbook:8
-#, no-c-format
-msgid "The Bible stands alone in many ways. It is unique in:"
-msgstr ""
-
-#: index.docbook:11
-#, no-c-format
-msgid ""
-"popularity. Bible sales in North America: more than $500 million per year. "
-"The Bible is both the the all-time and year-to-year best seller!"
-msgstr ""
-
-#: index.docbook:11
-#, no-c-format
-msgid ""
-"authorship. It was written over a period of 1600 years by 40 different "
-"authors from different backgrounds, yet reads as if written by one."
-msgstr ""
-
-#: index.docbook:11
-#, no-c-format
-msgid ""
-"preservation. F. F. Bruce in <emphasis>Are New Testament Documents Reliable?"
-"</emphasis> compares New Testament manuscripts with other ancient texts:"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "Comparison of New Testament manuscripts with other ancient texts."
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "Work"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "When Written"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "Earliest Copy"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "Time Lapse"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "Number of Copies"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "Herodotus"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "448-428 B.C."
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "900 A.D."
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "1300 years"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "<entry>8 </entry>"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "Tacitus"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "100 A.D."
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "1100 A.D."
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "1000 years"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "<entry>20 </entry>"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "Caesar's <emphasis>Gallic War</emphasis>"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "50-58 B.C."
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "950 years"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "<entry>10 </entry>"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "Livy's <emphasis>Roman History</emphasis>"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "59 B.C. - 17 A.D."
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "900 years"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "New Testament"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "40 A.D. - 100 A.D."
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "130 A.D. Partial manuscripts 350 A.D. Full manuscripts"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "30 - 310 years"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid "5000 Greek &amp; 10,000 Latin"
-msgstr ""
-
-#: index.docbook:68
-#, no-c-format
-msgid ""
-"Ten copies of Caesar's <emphasis>Gallic War</emphasis> exist, the earliest "
-"of which was copied 900 years after Caesar wrote the original, etc. For the "
-"New Testament we have full manuscripts dating to 350 A. D., papyri "
-"containing most of the New Testament from the 200s, and a fragment of John's "
-"gospel from 130 A. D. How many manuscripts do we have to compare to each "
-"other? 5,000 in Greek and 10,000 in Latin!"
-msgstr ""
-
-#: index.docbook:76
-#, no-c-format
-msgid ""
-"\"In the verity and fullness of the evidence on which it rests, the text of "
-"the New Testament stands absolutely and unapproachably alone among other "
-"ancient prose writings.\""
-msgstr ""
-
-#: index.docbook:81
-#, no-c-format
-msgid "A Book that God Breathed"
-msgstr ""
-
-#: index.docbook:82
-#, no-c-format
-msgid ""
-"<emphasis>Heb.4:12 </emphasis>\"<emphasis>For the word of God is living and "
-"active... </emphasis>\" Jesus said <emphasis>(Mt.4:4),</emphasis> "
-"\"<emphasis>It is written, Man shall not live on bread alone, but on every "
-"word that proceeds [lit., is proceeding] from the mouth of God.</emphasis>\" "
-"As we read the Bible, God's Spirit is there to speak it to our hearts in a "
-"continually-fresh way."
-msgstr ""
-
-#: index.docbook:88
-#, no-c-format
-msgid ""
-"2 Tim.3:16 declares, \"<emphasis>All scripture is inspired by God [lit., God-"
-"breathed].</emphasis>\" Do you believe this? Before you answer, consider "
-"Jesus' attitude toward the Scriptures."
-msgstr ""
-
-#: index.docbook:92
-#, no-c-format
-msgid ""
-"He referred to the human authors, but took it for granted that behind them "
-"all was a single divine Author. He could equally say 'Moses said' or 'God "
-"said' (Mk.7:10). He could quote a comment of the narrator in Genesis 2:24 as "
-"an utterance of the Creator Himself (Mt.19:4-5). Similarly He said, 'Well "
-"did Isaiah prophesy of you hypocrites, as it is written', when what He went "
-"on to quote is the direct speech of the Lord God (Mk.7:6 &amp; Is.29:13). It "
-"is from Jesus Himself that the New Testament authors have gained their "
-"conviction of the dual authorship of Scripture. For them it was just as true "
-"to say that 'God spoke of old to our fathers by the prophets' (Heb.1:1) as "
-"it was to say that 'men moved by the Holy Spirit spoke from God' (2 "
-"Pe.1:21). God did not speak in such a way as to obliterate the personality "
-"of the human authors, nor did men speak in such a way as to corrupt the Word "
-"of the divine Author. God spoke. Men spoke. Neither truth must be allowed to "
-"detract from the other. ..."
-msgstr ""
-
-#: index.docbook:106
-#, no-c-format
-msgid ""
-"This, then, was Christ's view of the Scriptures. Their witness was God's "
-"witness. The testimony of the Bible is the testimony of God. And the chief "
-"reason why the Christian believes in the divine origin of the Bible is that "
-"Jesus Christ Himself taught it."
-msgstr ""
-
-#: index.docbook:112
-#, no-c-format
-msgid ""
-"2 Tim.3:16 goes on, \"<emphasis>and profitable for teaching, for correction, "
-"for training in righteousness, that the man of God may be adequate, equipped "
-"for every good work.</emphasis>\" If we accept that the Bible really is God "
-"speaking to us, it follows that it will be our authority in all matters of "
-"faith and conduct."
-msgstr ""
-
-#: index.docbook:118
-#, no-c-format
-msgid "A Book that Works"
-msgstr ""
-
-#: index.docbook:119
-#, no-c-format
-msgid ""
-"What will studying the Bible do for you? 1 Thess.2:13 says that the Bible "
-"\"<emphasis>performs its work in you who believe.</emphasis>\" Beside each "
-"scripture, write down the work the Word performs."
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid "What does Bible study do for Christians?"
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid "Reference"
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid "Action"
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid "Eph. 5:26"
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid ""
-"cleanses -- \"...having cleansed her by the washing of water with the word.\""
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid "Acts 20:32"
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid ""
-"builds up -- \" ...the word of His grace, which is able to build you up and "
-"to give you the inheritance among all those who are sanctified. \""
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid "Rom. 15:4"
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid ""
-"encourages -- \"that through perseverance and the encouragement of the "
-"Scriptures we might have hope.\""
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid "Rom. 10:17"
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid ""
-"gives faith -- \"So faith comes from hearing, and hearing by the word of "
-"Christ.\""
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid "1 Cor. 10:11"
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid ""
-"instructs -- \"Now these things happened to them for an example, and they "
-"were written for our instruction\""
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid "Mt. 4:4"
-msgstr ""
-
-#: index.docbook:125
-#, no-c-format
-msgid ""
-"nourishment -- \"But He answered and said, 'It is written, Man shall not "
-"live on bread alone, but on every word that proceeds out of the mouth of "
-"God.'\""
-msgstr ""
-
-#: index.docbook:201
-#, no-c-format
-msgid "A Book that Liberates"
-msgstr ""
-
-#: index.docbook:202
-#, no-c-format
-msgid ""
-"Jn.8:32 \"<emphasis>and you shall know the truth, and the truth shall make "
-"you free.</emphasis>\"This is usually quoted by itself. Is this a "
-"conditional or unconditional promise? Would it apply to all kinds of "
-"knowledge? Find the answers by examining the first half of the sentence, in "
-"v.31. \"<emphasis>If you abide in My word, then you are truly disciples of "
-"Mine... </emphasis>\""
-msgstr ""
-
-#: index.docbook:209
-#, no-c-format
-msgid ""
-"We see that this is a conditional promice, specifically speaking of the "
-"truth of God's word."
-msgstr ""
-
-#: index.docbook:211
-#, no-c-format
-msgid ""
-"The Greek word for \"wind\" used in Eph.4:14 means a <emphasis>violent wind."
-"</emphasis> \"<emphasis>As a result, we are no longer to be children, tossed "
-"here and there by waves, and carried about by every wind of doctrine...</"
-"emphasis>\"One thing studying the Bible does for us is to ground us in the "
-"truth, with the result that we won't be easily \"blown away.\""
-msgstr ""
-
-#: index.docbook:217
-#, no-c-format
-msgid ""
-"<emphasis>But Jesus answered and said to them, </emphasis>\"<emphasis>You "
-"are mistaken [KJV Ye do err], not understanding the Scriptures, or the power "
-"of God.</emphasis>\"Mt.22:29"
-msgstr ""
-
-#: index.docbook:219
-#, no-c-format
-msgid "What 2 things do we need to know to be kept from error?"
-msgstr ""
-
-#: index.docbook:220
-#, no-c-format
-msgid "God's word"
-msgstr ""
-
-#: index.docbook:220
-#, no-c-format
-msgid "God's power"
-msgstr ""
-
-#: index.docbook:225
-#, no-c-format
-msgid "A Book that Wars"
-msgstr ""
-
-#: index.docbook:226
-#, no-c-format
-msgid "Eph.6:10-18 is one picture of our spiritual armament."
-msgstr ""
-
-#: index.docbook:228
-#, no-c-format
-msgid "Spiritual Armor"
-msgstr ""
-
-#: index.docbook:228
-#, no-c-format
-msgid "Question"
-msgstr ""
-
-#: index.docbook:228
-#, no-c-format
-msgid "Answer"
-msgstr ""
-
-#: index.docbook:228
-#, no-c-format
-msgid "How many of the weapons listed here are defensive weapons?"
-msgstr ""
-
-#: index.docbook:228
-#, no-c-format
-msgid "<entry>5</entry>"
-msgstr ""
-
-#: index.docbook:228
-#, no-c-format
-msgid "How many are offensive?"
-msgstr ""
-
-#: index.docbook:228
-#, no-c-format
-msgid "<entry>One</entry>"
-msgstr ""
-
-#: index.docbook:228
-#, no-c-format
-msgid "Which one(s)?"
-msgstr ""
-
-#: index.docbook:228
-#, no-c-format
-msgid "the word - <foreignphrase>rhema</foreignphrase>"
-msgstr ""
-
-#: index.docbook:242
-#, no-c-format
-msgid "Exhortations"
-msgstr ""
-
-#: index.docbook:243
-#, no-c-format
-msgid ""
-"2 Tim.2:15 (KJV) \"<emphasis>Study to show thyself approved unto God, a "
-"workman that needeth not to be ashamed, rightly dividing the word of truth.</"
-"emphasis>\""
-msgstr ""
-
-#: index.docbook:247
-#, no-c-format
-msgid ""
-"Col.3:16 \"<emphasis>Let the word of Christ richly dwell within you; with "
-"all wisdom teaching and admonishing one another with psalms and hymns and "
-"spiritual songs, singing with thankfulness in your hearts to God.</emphasis>"
-"\""
-msgstr ""
-
-#: index.docbook:252
-#, no-c-format
-msgid "If you're rich in something, how much of it do you have?"
-msgstr ""
-
-#: index.docbook:254
-#, no-c-format
-msgid "Not a little!"
-msgstr ""
-
-#: index.docbook:257
-#, no-c-format
-msgid ""
-"Eccl.12:11 \"<emphasis>The words of wise men are like goads, and masters of "
-"these collections are like well-driven nails; they are given by one "
-"Shepherd. But beyond this, my son, be warned: the writing of many books is "
-"endless, and excessive devotion to books is wearying to the body.</emphasis>"
-"\""
-msgstr ""
-
-#: index.docbook:264
-#, no-c-format
-msgid "Appendix: \"Once for All\""
-msgstr ""
-
-#: index.docbook:268
-#, no-c-format
-msgid ""
-"The truth regarding the finality of God's initiative in Christ is conveyed "
-"by one word of the Greek Testament, namely the adverb <foreignphrase>hapax</"
-"foreignphrase> and <foreignphrase>ephapax</foreignphrase>. It is usually "
-"translated in the Authorized Version once, meaning once for all. It is used "
-"of what is so done as to be of perpetual validity and never need repetition, "
-"and is applied in the NT to both revelation and redemption. Thus, Jude "
-"refers to the faith which was once for all delivered to the saints (Jude 3), "
-"and Romans says, \"<emphasis>Christ also died for sins once for all</"
-"emphasis>\" (Rom.6:10, see also 1 Pe.3:18; Heb.9:26-28)."
-msgstr ""
-
-#: index.docbook:277
-#, no-c-format
-msgid ""
-"Thus we may say that God has spoken once for all and Christ has suffered "
-"once for all. This means that the Christian revelation and the Christian "
-"redemption are both alike in Christ complete. Nothing can be added to either "
-"without being derogatory to Christ... These are the two rocks on which the "
-"Protestant Reformation was built -- Gods revealed word without the addition "
-"of human traditions and Christ's finished work without the addition of human "
-"merits. The Reformers great watchwords were <foreignphrase>sola scriptura</"
-"foreignphrase> for our authority and <foreignphrase>sola gratia</"
-"foreignphrase> for our salvation."
-msgstr ""
-
-#: index.docbook:289
-#, no-c-format
-msgid "Supplement: Bible Reading Programs"
-msgstr ""
-
-#: index.docbook:290
-#, no-c-format
-msgid ""
-"Here are some easy programs to systematically read your Bible. You can do "
-"more than one at a time if you like, for instance #1 with #4, or #2 with #5. "
-"Vary the program from year to year to keep it fresh!"
-msgstr ""
-
-#: index.docbook:294
-#, no-c-format
-msgid "New Testament in a Year: read one chapter each day, 5 days a week."
-msgstr ""
-
-#: index.docbook:294
-#, no-c-format
-msgid ""
-"Proverbs in a Month: read one chapter of Proverbs each day, corresponding to "
-"the day of the month."
-msgstr ""
-
-#: index.docbook:294
-#, no-c-format
-msgid ""
-"Psalms in a Month: read 5 Psalms at intervals of 30 each day, for instance "
-"on the 20th you read Ps.20, 50, 80, 110, &amp; 140."
-msgstr ""
-
-#: index.docbook:294
-#, no-c-format
-msgid ""
-"Psalms &amp; Proverbs in 6 months: read through Psalms and Proverbs one "
-"chapter per day."
-msgstr ""
-
-#: index.docbook:294
-#, no-c-format
-msgid ""
-"Old Testament without Psalms &amp; Proverbs in 2 years: if you read one "
-"chapter a day of the Old Testament, skipping over Psalms &amp; Proverbs, you "
-"will read the Old Testament in 2 years and 2 weeks."
-msgstr ""
-
-#: index.docbook:1
-#, no-c-format
-msgid "Rules of Bible Interpretation (Hermeneutics)"
-msgstr ""
-
-#: index.docbook:2
-#, no-c-format
-msgid ""
-"We already learned about the \"3 Cs\": content, context, cross-reference. We "
-"want to expand that now by delving briefly into biblical hermeneutics, whose "
-"goal is to discover the meaning intended by the original author (and "
-"Author!). While many applications of a passage are valid, only one "
-"interpretation is valid. The scripture itself says this by saying that no "
-"scripture is of any private interpretation (2 Pe.1:20 KJV <emphasis>"
-"\"Knowing this first, that no prophesy of scripture is of any private "
-"interpretation.\"</emphasis>) Certain rules are helps toward discovering the "
-"correct meaning; by ignoring these rules people have brought much trouble on "
-"themselves and their followers. 2 Pe.3:16 <emphasis>\"...in which are some "
-"things hard to understand, which the untaught and unstable distort, as they "
-"do also the rest of the Scriptures, to their own destruction.\"</emphasis>"
-msgstr ""
-
-#: index.docbook:10
-#, no-c-format
-msgid ""
-"How do we go about discovering the intended meaning of a passage? Let's say "
-"your attention has been drawn to a particular verse whose meaning is not "
-"clear to you. How do you study it out? Keep these rules in mind:"
-msgstr ""
-
-#: index.docbook:13
-#, no-c-format
-msgid "Rule 1 - Interpret according to the exact meaning of the words."
-msgstr ""
-
-#: index.docbook:15
-#, no-c-format
-msgid ""
-"The more precise we can be with the exact, original meaning of the words the "
-"better our interpretation will be. Try to find the exact meaning of the key "
-"words by following these steps:"
-msgstr ""
-
-#: index.docbook:18
-#, no-c-format
-msgid "Step 1) Definition"
-msgstr ""
-
-#: index.docbook:19
-#, no-c-format
-msgid ""
-"Look up the definition in a Greek or Hebrew dictionary. For verbs, the verb "
-"tense is also crucial."
-msgstr ""
-
-#: index.docbook:22
-#, no-c-format
-msgid "Step 2) Cross-reference"
-msgstr ""
-
-#: index.docbook:23
-#, no-c-format
-msgid ""
-"Compare scripture with scripture. Seeing how the same Greek or Hebrew word "
-"(not the English word) is used in scripture may clarify or throw new light "
-"on the definition. How does the same author use this word elsewhere? Other "
-"authors? Your reference tools may give you uses of the word in non-biblical "
-"documents, as well. Why do we have to go to the original languages; why "
-"isn't the English word good enough? BECAUSE MORE THAN ONE GREEK WORD MAY BE "
-"TRANSLATED INTO THE SAME ENGLISH WORD, AND THE GREEK WORDS MAY HAVE "
-"DIFFERENT SHADES OF MEANING."
-msgstr ""
-
-#: index.docbook:30
-#, no-c-format
-msgid "Example 1A"
-msgstr ""
-
-#: index.docbook:31
-#, no-c-format
-msgid ""
-"Jn.20:17 <emphasis>\"Touch me not\"</emphasis> (KJV) sounds harsh, doesn't "
-"it? Sounds like Jesus doesn't want to be touched now that He is risen, that "
-"He is too holy or something. But that doesn't seem right, so let's look it "
-"up in Spiros Zodhiates' <emphasis>The Complete Word Study New Testament</"
-"emphasis> (AMG Publishers, 1991)."
-msgstr ""
-
-#: index.docbook:34
-#, no-c-format
-msgid ""
-"Definition: Turning to John 20:17, above the word \"Touch\" we see \"pim680."
-"\" The letters give us a code for the part of speech, and the number refers "
-"to Strong's dictionary reference. Let's look up the definition (p. 879). "
-"\"680. Haptomai; from hapto (681), touch. Refers to such handling of an "
-"object as to exert a modifying influence upon it... Distinguished from "
-"pselaphao (5584), which actually only means to touch the surface of "
-"something. \" Now look up \"pim.\" The grammar codes in Zodhiates come right "
-"after Revelation; on p. 849 we see that pim stands for \"present imperative "
-"active (80)\". On p.857, \"Present Imperative. In the active voice, it may "
-"indicate a command to do something in the future which involves continuous "
-"or repeated action or, when it is negated, a command to stop doing "
-"something. \" This is a negative command, so it is to stop doing something "
-"that is already occuring. So, what have we found?"
-msgstr ""
-
-#: index.docbook:42
-#, no-c-format
-msgid ""
-"MARY IS ALREADY CLINGING TO JESUS, AND HE IS SAYING TO STOP HOLDING HIM!"
-msgstr ""
-
-#: index.docbook:45
-#, no-c-format
-msgid "Ex. 1B"
-msgstr ""
-
-#: index.docbook:46
-#, no-c-format
-msgid ""
-"In James 5:14, <emphasis>Elders are told to pray and anoint someone who is "
-"sick</emphasis>. What is this anointing?"
-msgstr ""
-
-#: index.docbook:47
-#, no-c-format
-msgid ""
-"Definition of aleipho (218) - \"to oil\" (Strong's); but we also have "
-"another Greek word translated \"anoint\", chrio (5548) - \"to smear or rub "
-"with oil, i.e. to consecrate to an office or religious service\" (Strong's). "
-"Since it's a verb, consider the tense also, \"apta\" aorist participle "
-"active. \"The aorist participle expresses simple action, as opposed to "
-"continuous action...When its relaitonship to the main verb is temporal, it "
-"usually signifies action prior to that of the main verb.\" (Zodhiates p.851)"
-msgstr ""
-
-#: index.docbook:53
-#, no-c-format
-msgid ""
-"Cross-references for aleipho:\n"
-"  Mt.6:17 But you, when you fast, anoint your head\n"
-"  Mk.16:1 [the women] brought spices that they might come and anoint Him.\n"
-"  Mk.6:13 And they were...anointing with oil many sick people and healing "
-"them.\n"
-"  Lk.7:38 ...kissing His feet and anointing them with the perfume\n"
-"  Jn.12:3 Mary...anointed the feet of Jesus, and wiped them with her hair\n"
-"Cross-references of chrio:\n"
-"  Lk.4:18 The Spirit of the Lord is upon me, because He has anointed me to "
-"preach...\"\n"
-"  Acts 4:27 Jesus, whom Thou hast anointed\n"
-"  Acts 10:38 God anointed Jesus with the Holy Ghost and power\n"
-"  2 Cor.1:21 Now He who...anointed us is God"
-msgstr ""
-
-#: index.docbook:67
-#, no-c-format
-msgid ""
-"So what's the difference between aleipho and chrio? Look back over the cross-"
-"references and the definitions, and sum up the difference: ALEIPHO IS A "
-"PRACTICAL USE OF OIL AND CHRIO IS A SPIRITUAL"
-msgstr ""
-
-#: index.docbook:70
-#, no-c-format
-msgid ""
-"As an illustration (although the word is not used) of the practical use of "
-"oil at that time, when the good Samaritan cared for the man beat up by "
-"robbers he poured oil and wine in the wound. So oil had a medicinal use in "
-"Jesus' day."
-msgstr ""
-
-#: index.docbook:74
-#, no-c-format
-msgid ""
-"Now let's apply what we just learned by this word study to James 5:14 "
-"<emphasis>\"Is any among you sick? Let him call for the elders of the "
-"church; and let them pray over him, anointing him with oil in the name of "
-"the Lord.\"</emphasis> Is \"anointing\" spiritual or practical? Practical!"
-msgstr ""
-
-#: index.docbook:77
-#, no-c-format
-msgid ""
-"And the tense in Greek, the aorist participle, would be better translated "
-"\"having anointed,\" so the order is the anointing first, then the prayer "
-"(\"in the name of the Lord\"refers to the prayer, not the anointing). James "
-"5 is saying that the elders should give the sick person medicine and pray "
-"for him in the name of the Lord. Doesn't that express a beautiful balance of "
-"practical and spiritual in our God!"
-msgstr ""
-
-#: index.docbook:89
-#, no-c-format
-msgid "Rule 2 - Interpret within the biblical context"
-msgstr ""
-
-#: index.docbook:91
-#, no-c-format
-msgid ""
-"Interpret scripture in harmony with other scripture. What do the verses on "
-"each side say? What is the theme of the chapter? the book? Does your "
-"interpretation fit with these? If not, it is flawed. Usually, the context "
-"supplies what we need to correctly interpret the passage. Context is key. If "
-"confusion remains as to the meaning after we have interpreted the text "
-"within its context, we have to look further."
-msgstr ""
-
-#: index.docbook:96
-#, no-c-format
-msgid "Example 2A"
-msgstr ""
-
-#: index.docbook:97
-#, no-c-format
-msgid ""
-"In a previous lesson we considered Jn.3:5 <emphasis>\"born of water and the "
-"Spirit.\"</emphasis> In context, what is the water under discussion here?"
-msgstr ""
-
-#: index.docbook:99
-#, no-c-format
-msgid ""
-"Water baptism is not under discussion here, which would be a big switch from "
-"the subject being discussed by Jesus and Nicodemus. Watch out for a sudden "
-"change of topic, it may be a clue that your interpretation has been "
-"derailed! The water is the amniotic fluid, \"born of water\" = natural birth."
-msgstr ""
-
-#: index.docbook:103
-#, no-c-format
-msgid "Example 2B"
-msgstr ""
-
-#: index.docbook:104
-#, no-c-format
-msgid ""
-"1 Cor.14:34 <emphasis>\"Let the women keep silent in the churches\"</"
-"emphasis> has to be taken within the biblical context of 1 Cor.11:5 "
-"<emphasis>\"every woman...while praying or prophesying...\"</emphasis>"
-msgstr ""
-
-#: index.docbook:107
-#, no-c-format
-msgid "Example 2C"
-msgstr ""
-
-#: index.docbook:108
-#, no-c-format
-msgid ""
-"Acts 2:38 <emphasis>And Peter said to them, \"Repent, and let each of you be "
-"baptized in the name of Jesus Christ for the forgiveness of your sins...\"</"
-"emphasis> Is this teaching baptismal regeneration? If this was the only "
-"verse of scripture we had, we would have to conclude that. But in the light "
-"of the clear teaching elsewhere that regeneration happens by faith in "
-"Christ, we have to interpret it otherwise. Peter is urging baptism as a way "
-"for his hearers to respond to the gospel. If baptism were the pathway to "
-"being born again, how could Paul write 1 Cor.1:17 <emphasis>\"For Christ did "
-"not send me to baptize, but to preach the gospel\"</emphasis>?"
-msgstr ""
-
-#: index.docbook:120
-#, no-c-format
-msgid "Rule 3 - Interpret within the historical and cultural context"
-msgstr ""
-
-#: index.docbook:122
-#, no-c-format
-msgid ""
-"At first we are not asking \"What does it mean to me?\" but \"What did it "
-"mean to the original readers?\"; later we can ask, \"What does it mean to me?"
-"\" We have to take into account the historical and cultural background of "
-"the author and the recipients."
-msgstr ""
-
-#: index.docbook:127
-#, no-c-format
-msgid "Example 3A"
-msgstr ""
-
-#: index.docbook:127
-#, no-c-format
-msgid ""
-"\"3 days &amp; 3 nights\" (Mt.12:40) have led some to come up with a "
-"\"Wednesday crucifixion theory,\" esp. the cult of Armstrongism. How could "
-"Jesus die on Friday afternoon and rise Sunday morning yet \"be raised on the "
-"third day\" (Mt.16:21)? Exact meanings of \"three\" or \"days\" won't help "
-"explain the apparent contradiction."
-msgstr ""
-
-#: index.docbook:132
-#, no-c-format
-msgid ""
-"We need an historical tidbit: Jews counted any part of a day as a full day, "
-"as we would count buckets of water (if there were six and one-half buckets "
-"of water, we would say there were 7 buckets of water even if one was only "
-"partly full). So to the Jewish mind, any part of a day counted as a full "
-"day, and days started at 6 p.m. and ended at 6 a.m. Friday from 3 p.m. to 6 "
-"p.m. = day 1. Friday 6 p.m. to Saturday 6 p.m. = day 2. Saturday 6 p.m. to "
-"Sunday 5 or so a.m. = day 3. Interpreting within the cultural context keeps "
-"us out of trouble."
-msgstr ""
-
-#: index.docbook:139
-#, no-c-format
-msgid "Example 3B"
-msgstr ""
-
-#: index.docbook:139
-#, no-c-format
-msgid ""
-"Gen.15:7-21. The historical context is that cutting animals in two and then "
-"walking between the pieces was the normal way of entering a contract in "
-"Abraham's day. Both parties walked between, taking the pledge that "
-"dismemberment would happen to them if they didn't live up to their part of "
-"the contract. But in this case only God goes thru, making it a unilateral "
-"covenant."
-msgstr ""
-
-#: index.docbook:147
-#, no-c-format
-msgid "Rule 4 - Interpret according to the normal usage of words in language"
-msgstr ""
-
-#: index.docbook:149
-#, no-c-format
-msgid ""
-"Let literal language be literal and figurative language be figurative. And "
-"watch out for idioms, which have special meanings."
-msgstr ""
-
-#: index.docbook:152
-#, no-c-format
-msgid "Example 4A"
-msgstr ""
-
-#: index.docbook:152
-#, no-c-format
-msgid "\"evil eye\" in Mt.6:23."
-msgstr ""
-
-#: index.docbook:153
-#, no-c-format
-msgid ""
-"Rule 1, definition of \"evil\" and \"eye\" - no help here. Rule 2, context: "
-"seems to confuse us even more. It doesn't seem to fit with what goes before "
-"and after! This should tip us off that we aren't understanding it rightly!!"
-msgstr ""
-
-#: index.docbook:156
-#, no-c-format
-msgid ""
-"What we have here is a Hebrew idiom, \"evil eye.\" Let's look up other uses "
-"of this idiom: Mt.20:15 \"<emphasis>Is it not lawful for me to do what I "
-"wish with what is my own? Or is your eye envious [lit.\"evil\"] because I am "
-"generous [lit.\"good\"]?</emphasis>\" We find that having an \"evil eye\" is "
-"a Hebrew idiom for being stingy or envious. Now go back to Mt.6 and notice "
-"how this understanding ties in so perfectly to the context."
-msgstr ""
-
-#: index.docbook:161
-#, no-c-format
-msgid "Example 4B"
-msgstr ""
-
-#: index.docbook:162
-#, no-c-format
-msgid ""
-"Is.59:1 \"<emphasis>The Lord's hand is not short;</emphasis>\" Deut.33:27 "
-"\"<emphasis>Underneath are the everlasting arms.</emphasis>\" References to "
-"body parts of God are used by Latter-Day Saints to prove that God was once a "
-"man just as we are. Once they convince people of that, they go on to teach "
-"that we can become God just like He is! At a lecture he was giving, a group "
-"of Mormon elders challenged Walter Martin (author of <emphasis>Kingdom of "
-"the Cults</emphasis>) with an enumeration of verses like these. Dr. Martin "
-"then asked the Mormons to read one more scripture: Ps.91:4 \"<emphasis>He "
-"will cover you with His feathers; And under His wings shalt thou trust.</"
-"emphasis>\" W.M. said, \"By the same rules of interpretation that you just "
-"proved God to be a man, you just proved that He is a bird.\" The Mormons had "
-"to laugh as they realised the ridiculousness of their position."
-msgstr ""
-
-#: index.docbook:174
-#, no-c-format
-msgid ""
-"Rule 5 - Understand the purpose of parables and the difference between a "
-"parable and an allegory"
-msgstr ""
-
-#: index.docbook:176
-#, no-c-format
-msgid "An allegory is: A STORY WHERE EACH ELEMENT HAS A MEANING"
-msgstr ""
-
-#: index.docbook:177
-#, no-c-format
-msgid "Every parable is an allegory, true or false?"
-msgstr ""
-
-#: index.docbook:179
-#, no-c-format
-msgid ""
-"Some parables are allegories, for instance, the parable of the sower is an "
-"allegory: the seed is the word of God, the thorns are worries and greed, "
-"etc. But most parables are not allegories but simply stories to illustrate "
-"one point. It's dangerous to get our doctrine from parables; they can be "
-"twisted to say all sorts of things. We need to get our doctrine from clear "
-"scriptures that lay it out; then if a parable illustrates that, fine."
-msgstr ""
-
-#: index.docbook:184
-#, no-c-format
-msgid "Example 5A"
-msgstr ""
-
-#: index.docbook:185
-#, no-c-format
-msgid ""
-"The parable of the widow with the unrighteous judge in Lk.18:1-8. This story "
-"illustrates one lesson: boldness in prayer. If we draw it into an allegory, "
-"what do we have?"
-msgstr ""
-
-#: index.docbook:187
-#, no-c-format
-msgid ""
-"All sorts of violence happens to the meanings: God is reluctant to protect "
-"the rights of widows, prayer \"bothers\" Him, etc."
-msgstr ""
-
-#: index.docbook:190
-#, no-c-format
-msgid "Example 5B"
-msgstr ""
-
-#: index.docbook:191
-#, no-c-format
-msgid ""
-"The parable of the unrighteous steward in Lk.16:1-9. What is the point of "
-"the parable? Is it an allegory?"
-msgstr ""
-
-#: index.docbook:193
-#, no-c-format
-msgid ""
-"The steward is commended for only one thing, his shrewdness in using what he "
-"had to prepare for a time when he wouldn't have it. But he is not commended "
-"for his unethical behavior in cheating his master."
-msgstr ""
-
-#: index.docbook:19
-#, no-c-format
-msgid "The Biblestudy HowTo"
-msgstr ""
-
-#: index.docbook:22
-#, no-c-format
-msgid "<firstname>Bob</firstname> <surname>Harman</surname>"
-msgstr ""
-
-#: index.docbook:28
-#, no-c-format
-msgid "ROLES_OF_TRANSLATORS"
-msgstr ""
-
-#: index.docbook:32
-#, no-c-format
-msgid "The team of &bibletime;, info@bibletime.info"
-msgstr ""
-
-#: index.docbook:35
-#, no-c-format
-msgid "Bob Harman"
-msgstr ""
-
-#: index.docbook:38
-#, no-c-format
-msgid ""
-"The copyright of this text is held by the author Bob Harman. The text was "
-"adapted for publication with BibleTime by Fred Saalbach."
-msgstr ""
-
-#: index.docbook:42
-#, no-c-format
-msgid ""
-"Non exclusive serial rights for this distribution of this document with the "
-"&bibletime; Software have been made. Redistribution as part of the Bibletime "
-"software without modification and limited reproduction as provided by the "
-"\"fair use\" provisions of the US copyright code are also permitted."
-msgstr ""
-
-#: index.docbook:48
-#, no-c-format
-msgid ""
-"For questions regarding the use of this material contact Bob Harman c/o New "
-"Covenant Church 1079 Big Bethel Rd. Hampton VA 23666 USA "
-"<email>ncc@ncchampton.org</email>."
-msgstr ""
-
-#: index.docbook:52
-#, no-c-format
-msgid ""
-"Scripture quotes are from the New American Standard Bible unless otherwise "
-"indicated"
-msgstr ""
-
-#: index.docbook:61
-#, no-c-format
-msgid "Abstract"
-msgstr ""
-
-#: index.docbook:62
-#, no-c-format
-msgid ""
-"The <application>Biblestudy HowTo</application> is a guide for studying the "
-"Bible."
-msgstr ""
-
-#: index.docbook:65
-#, no-c-format
-msgid ""
-"It is the hope of the &bibletime; team that this HowTo will provoke the "
-"readers to study the scriptures to see what they say. This particular study "
-"guide has been chosen as it takes care not to advocate any particular "
-"denominational doctrine. We expect you to read and study the scriptures to "
-"understand what they say. If you start with the attitude that you want to "
-"have the Lord sow his word in your heart He will not disappoint you."
-msgstr ""
-
-#: index.docbook:75
-#, no-c-format
-msgid "Bible"
-msgstr ""
-
-#: index.docbook:77
-#, no-c-format
-msgid "HowTo"
-msgstr ""
diff --git a/pot/messages.pot b/pot/messages.pot
deleted file mode 100644
index f7dee9a..0000000
--- a/pot/messages.pot
+++ /dev/null
@@ -1,3285 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-13 16:31+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../bibletime/backend/cswordbackend.cpp:416
-#: ../bibletime/frontend/coptionsdialog.cpp:347
-msgid "Footnotes"
-msgstr ""
-
-#: ../bibletime/backend/cswordbackend.cpp:418
-#: ../bibletime/util/cresmgr.cpp:1458
-msgid "Strong's Numbers"
-msgstr ""
-
-#: ../bibletime/backend/cswordbackend.cpp:420
-msgid "Headings"
-msgstr ""
-
-#: ../bibletime/backend/cswordbackend.cpp:422
-msgid "Morphological Tags"
-msgstr ""
-
-#: ../bibletime/backend/cswordbackend.cpp:424
-msgid "Lemmas"
-msgstr ""
-
-#: ../bibletime/backend/cswordbackend.cpp:426
-msgid "Hebrew Vowel Points"
-msgstr ""
-
-#: ../bibletime/backend/cswordbackend.cpp:428
-msgid "Hebrew Cantillation"
-msgstr ""
-
-#: ../bibletime/backend/cswordbackend.cpp:430
-msgid "Greek Accents"
-msgstr ""
-
-#: ../bibletime/backend/cswordbackend.cpp:432
-msgid "Red letter words"
-msgstr ""
-
-#: ../bibletime/backend/cswordbackend.cpp:434
-msgid "Textual Variants"
-msgstr ""
-
-#: ../bibletime/backend/cswordbackend.cpp:436
-msgid "Scripture Cross-references"
-msgstr ""
-
-#: ../bibletime/backend/cswordbackend.cpp:438
-msgid "Transliteration between scripts"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:67
-msgid "Creating BibleTime's GUI"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:85
-msgid "Initializing menu- and toolbars"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:88 ../bibletime/util/cresmgr.cpp:899
-msgid "Clear print queue"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:125
-msgid "Search in open module(s)"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:137
-msgid "Search in default bible"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:157
-msgid "&Show main index"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:175
-msgid "Configure &Sword"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:194
-msgid "&Cascade"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:207
-msgid "&Tile"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:220
-msgid "&Auto cascade"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:233
-msgid "A&uto Tile"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:246
-msgid "&Close all"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:259
-msgid "&Save session"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:271
-msgid "&Save as new session"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:284
-msgid "&Load session"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:296
-msgid "&Configure sessions"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:309
-msgid "&Fullscreen mode"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:336
-msgid "&Handbook"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:348
-msgid "&Bible Study Howto"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:375
-msgid "&Daily tip"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:462
-msgid "Initializing Sword"
-msgstr ""
-
-#: ../bibletime/bibletime_init.cpp:509
-msgid "Initializing print system"
-msgstr ""
-
-#: ../bibletime/bibletime_slots.cpp:291
-msgid "Abort printing"
-msgstr ""
-
-#: ../bibletime/bibletime_slots.cpp:291
-msgid "Printing..."
-msgstr ""
-
-#: ../bibletime/bibletime_slots.cpp:481
-#: ../bibletime/frontend/coptionsdialog.cpp:133
-msgid "Please enter a name for the new session."
-msgstr ""
-
-#: ../bibletime/bibletime_slots.cpp:481
-msgid "Session name:"
-msgstr ""
-
-#: ../bibletime/frontend/cbtconfig.cpp:240
-msgid "Old testament"
-msgstr ""
-
-#: ../bibletime/frontend/cbtconfig.cpp:241
-msgid "Moses/Pentateuch/Torah"
-msgstr ""
-
-#: ../bibletime/frontend/cbtconfig.cpp:242
-msgid "History"
-msgstr ""
-
-#: ../bibletime/frontend/cbtconfig.cpp:243
-msgid "Prophets"
-msgstr ""
-
-#: ../bibletime/frontend/cbtconfig.cpp:244
-msgid "New testament"
-msgstr ""
-
-#: ../bibletime/frontend/cbtconfig.cpp:245
-msgid "Gospels"
-msgstr ""
-
-#: ../bibletime/frontend/cbtconfig.cpp:246
-msgid "Letters/Epistles"
-msgstr ""
-
-#: ../bibletime/frontend/cbtconfig.cpp:247
-msgid "Paul's Epistles"
-msgstr ""
-
-#: ../bibletime/frontend/cexportmanager.cpp:408
-msgid ""
-"*.html *.htm | HTML files\n"
-" *.* | All files (*.*)"
-msgstr ""
-
-#: ../bibletime/frontend/cexportmanager.cpp:410
-msgid ""
-"*.txt | Text files\n"
-" *.* | All files (*.*)"
-msgstr ""
-
-#: ../bibletime/frontend/cexportmanager.cpp:412
-msgid "All files (*.*)"
-msgstr ""
-
-#: ../bibletime/frontend/cinputdialog.cpp:72
-msgid "Ok"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:75
-msgid "Preferences"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:133
-#: ../bibletime/frontend/coptionsdialog.cpp:414
-#: ../bibletime/util/cresmgr.cpp:1486
-msgid "Create new session"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:156
-msgid "Please enter a new name for the session."
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:156
-#: ../bibletime/util/cresmgr.cpp:1496
-msgid "Rename session"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:180
-msgid "Startup"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:185
-msgid "Show tip of the day"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:195
-msgid "Show startuplogo"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:205
-msgid "Restore windows from the last BibleTime session"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:224
-msgid "Select custom fonts per-language"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:225
-msgid ""
-"Here you find a list of all languages of the installed modules. You can "
-"specify a custom font for each language that needs a special font to be "
-"displayed correctly."
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:260
-msgid "Use custom font"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:269
-msgid "The quick brown fox jumps over the lazy dog."
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:283
-msgid "Colors"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:290
-msgid "Choose colors"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:291
-msgid ""
-"Choose custom colors to alter the apperance of the display windows. Some "
-"options like \"Words of Jesus\" only apply to texts which offer special "
-"features."
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:301
-msgid "Text"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:312
-msgid "Highlighted verse"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:324
-msgid "Background"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:336
-msgid "Hyperlinks"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:358
-#: ../bibletime/util/cresmgr.cpp:1468
-msgid "Words of Jesus"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:370
-msgid "Strong's numbers"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:382
-msgid "Morphologic tags"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:397
-msgid "Sessions"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:402
-msgid "Manage sessions"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:403
-msgid ""
-"Sessions define the appereance of the work area, for example which windows "
-"are open and which texts should displayed in these windows. New sessions "
-"only work after you've saved something into them."
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:418
-msgid "Delete selected session"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:422
-msgid "Rename selected session"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:440
-msgid "Accelerators"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:447
-msgid "Application-wide"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:460
-msgid "All display windows"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:474
-msgid "Bible windows"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:488
-msgid "Commentary windows"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:503
-msgid "Lexicon windows"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:519
-msgid "Book windows"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:534
-msgid "Sword"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:537
-msgid "General"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:543
-#: ../bibletime/frontend/coptionsdialog.cpp:552
-msgid "Use key cache for lexicons"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:544
-msgid ""
-"BibleTime can create a key cache for lexicons. This increases the speed of "
-"opening large lexicon modules significantly. Note: These files consume some "
-"disk space (usually not much), and reside in $KDEHOME/share/apps/bibletime/"
-"cache."
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:560
-msgid "Scrolling behaviour"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:561
-msgid ""
-"The down arrow moves to the <i>next</i> verse by default. Uncheck this box "
-"if you want it to move to the <i>previous</i> verse."
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:567
-#: ../bibletime/util/cresmgr.cpp:1511
-msgid "Use down arrow to scroll to next verse"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:574
-msgid "Specify a language for biblical booknames"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:575
-msgid ""
-"Sword has a number of locales available which can be used to "
-"internationalize the booknames of the bible. You can specify which locale to "
-"use. If you want to create a new locale, see http://www.crosswire.org/sword/"
-"develop for details."
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:582
-msgid "Language for biblical booknames"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:590 clanguagemgr.cpp:216
-msgid "English"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:608
-#: ../bibletime/frontend/coptionsdialog.cpp:613
-msgid "Default modules"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:614
-msgid ""
-"Default modules are used when no module is specified, for example when a "
-"hyperlink into a Bible or Lexicon was clicked ."
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:620
-msgid "Default Bible"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:628
-msgid "Default Commentary"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:637
-msgid "Default Lexicon"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:645
-msgid "Default Daily Devotional"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:653
-msgid "Default Hebrew Strong's Lexicon"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:661
-msgid "Default Greek Strong's Lexicon"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:669
-msgid "Default Hebrew Morphological Lexicon"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:676
-msgid "Default Greek Morphological Lexicon"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:771
-#: ../bibletime/frontend/coptionsdialog.cpp:774
-msgid "Filter settings"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:775
-msgid ""
-"Filters control the appereance of the text in the display windows. Here you "
-"can specify default settings for all filters. You can change the filter "
-"settings in each display window, of course."
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:782
-msgid "Insert line break after each verse"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:789
-msgid "Show verse numbers"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:796
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:144
-msgid "Show footnotes"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:803
-msgid "Show section headings"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:810
-msgid "Show Strong's numbers"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:817
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:164
-msgid "Show scripture cross-references"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:825
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:151
-msgid "Show morphologic tags"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:832
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:153
-msgid "Show lemmas"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:839
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:159
-msgid "Show Greek accents"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:846
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:155
-msgid "Show Hebrew vowel points"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:853
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:157
-msgid "Show Hebrew cantillation marks"
-msgstr ""
-
-#: ../bibletime/frontend/coptionsdialog.cpp:860
-msgid "Use textual variants"
-msgstr ""
-
-#: ../bibletime/frontend/cprofile.cpp:34
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:397
-msgid "unknown"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:151
-msgid "Manage installation sources"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:189
-#: ../bibletime/frontend/cswordsetupdialog.cpp:201
-msgid "Local sources"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:195
-msgid "Manage local sources"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:196
-msgid ""
-"Here you can setup the local sources for module installation, e.g. the path "
-"to your CD-Rom to install from a Sword CD.<br>On many Linux distributions "
-"the path to your cdrom is either <i>/media/cdrom</i> or <i>/cdrom</i> Please "
-"make sure you mounted the CD-Rom before you use BibleTime to install from CD-"
-"Rom."
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:204
-msgid "Add new directory"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:207
-msgid "Remove directory"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:258
-msgid "Remote sources"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:264
-msgid "Manage remote sources"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:265
-msgid ""
-"Setup remote sources like FTP servers which can be used to download Sword "
-"modules on your computer."
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:271
-#: ../bibletime/frontend/cswordsetupdialog.cpp:571
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1120
-msgid "Name"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:277
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1076
-msgid "New"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:298
-msgid "Edit remote source"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:304
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:607
-#: ../bibletime/printing/cstyleeditordialog.cpp:63
-#: ../bibletime/printing/cstylelist.cpp:44
-msgid "Name:"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:315
-msgid "Server:"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:321
-msgid "Path on server:"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:356
-msgid "New remote source"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:410
-msgid "Sword configuration"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:424
-msgid "Sword Path"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:435
-#: ../bibletime/util/cresmgr.cpp:1009
-msgid "Configure Sword"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:436
-msgid ""
-"The underlying Sword software uses an own configuration file. This page let "
-"you set up this file."
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:442
-msgid "Your Sword configuration file is <b>%1</b>"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:447
-msgid "Path to Sword modules"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:451
-msgid "Edit Entry"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:456
-msgid "Add Entry"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:461
-msgid "Remove Entry"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:470
-msgid "Install/Update Modules"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:492
-msgid "Install/update modules - Step 1"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:493
-msgid ""
-"Please choose a source and a destination. After that step click on the "
-"connect button.<br/><b>WARNING: If you live in a persecuted country and do "
-"not wish to risk detection you should NOT use the module remote installation "
-"feature!</b>"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:497
-msgid "Select source location"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:503
-msgid "Maintain sources"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:511
-msgid "Select target location"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:531
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1294
-msgid "Connect to source"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:546
-msgid "Remove Modules"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:558
-msgid "Remove installed module(s)"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:559
-msgid ""
-"This dialog lets you remove installed Sword modules from your system. Choose "
-"the modules and then click on the remove button."
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:563
-msgid "Select modules to be uninstalled"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:572
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:304
-msgid "Location"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:581
-msgid "Remove selected module(s)"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:672
-#: ../bibletime/frontend/cswordsetupdialog.cpp:727
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1374
-msgid "[Remote]"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:677
-#: ../bibletime/frontend/cswordsetupdialog.cpp:721
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1368
-msgid "[Local]"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:770
-msgid ""
-"You selected the following modules: %1.\n"
-"\n"
-"Do you really want to remove them from your system?"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:853
-#: ../bibletime/frontend/cswordsetupdialog.cpp:963
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:646
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:354
-msgid "Bibles"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:854
-#: ../bibletime/frontend/cswordsetupdialog.cpp:964
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:649
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:355
-msgid "Commentaries"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:855
-#: ../bibletime/frontend/cswordsetupdialog.cpp:965
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:652
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:356
-msgid "Lexicons"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:856
-#: ../bibletime/frontend/cswordsetupdialog.cpp:966
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:655
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:357
-msgid "Books"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:857
-#: ../bibletime/frontend/cswordsetupdialog.cpp:967
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:387
-msgid "Daily Devotionals"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:858
-#: ../bibletime/frontend/cswordsetupdialog.cpp:968
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:661
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:1214
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:396
-msgid "Glossaries"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:884
-#, c-format
-msgid "Scanning your modules: %1%"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1076
-msgid "Updated"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1105
-msgid "Install/update modules - Step 2"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1106
-msgid ""
-"Please choose the modules which should be installed / updated and click the "
-"install button."
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1121
-msgid "Installed version"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1122
-msgid "Remote version"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1123
-msgid "Status"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1139
-msgid "Install modules"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1204
-msgid ""
-"You selected the following modules: %1.\n"
-"\n"
-"Do you really want to install them on your system?"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1230
-msgid "Module installation ..."
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1284
-msgid "[%1]: %2% complete"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1310
-msgid ""
-"This directory is not writable, so modules can not be installed here using "
-"BibleTime. Do you want to use this directory instead of the previous value?"
-msgstr ""
-
-#: ../bibletime/frontend/cswordsetupdialog.cpp:1328
-msgid ""
-"This directory is not writable, so modules can not be installed here using "
-"BibleTime. Do you want to add it to the list of module directories?"
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:52
-msgid "Bible"
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:55
-msgid "Commentary"
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:58
-msgid "Lexicon"
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:61
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:1219
-msgid "Book"
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:64
-msgid "Hebrew morphological lexicon"
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:67
-msgid "Greek morphological lexicon"
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:70
-msgid "Hebrew Strong's lexicon"
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:73
-msgid "Greek Strong's lexicon"
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:80
-#: ../bibletime/frontend/ctooltipmanager.cpp:95
-msgid "Configuration problem!"
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:81
-msgid ""
-"Please make sure the default module for the type <font color=\"blue\"><i>%1</"
-"i></font> is properly configured in the options dialog."
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:96
-msgid ""
-"The module <FONT COLOR=\"blue\"><I>%1</I></FONT> was not found on your "
-"system. Install the module to make this tooltip work."
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:107
-msgid "Bookmark to"
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:174
-msgid "Module not set!"
-msgstr ""
-
-#: ../bibletime/frontend/ctooltipmanager.cpp:177
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:261
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:279
-#: ../bibletime/printing/cprintitemlist.cpp:44
-msgid "Module"
-msgstr ""
-
-#: ../bibletime/frontend/display/cdisplay.cpp:150
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:1185
-msgid "HTML files"
-msgstr ""
-
-#: ../bibletime/frontend/display/cdisplay.cpp:153
-msgid "Text files"
-msgstr ""
-
-#: ../bibletime/frontend/display/cdisplay.cpp:157
-msgid "Save document ..."
-msgstr ""
-
-#: ../bibletime/frontend/display/chtmlwritedisplay.cpp:137
-msgid "Choose a font"
-msgstr ""
-
-#: ../bibletime/frontend/display/chtmlwritedisplay.cpp:148
-msgid "Choose a font size"
-msgstr ""
-
-#: ../bibletime/frontend/display/chtmlwritedisplay.cpp:167
-msgid "Bold"
-msgstr ""
-
-#: ../bibletime/frontend/display/chtmlwritedisplay.cpp:189
-msgid "Underline"
-msgstr ""
-
-#: ../bibletime/frontend/display/chtmlwritedisplay.cpp:261
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:141
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:108
-msgid "Select all"
-msgstr ""
-
-#: ../bibletime/frontend/display/chtmlwritedisplay.cpp:265
-msgid "HTML editor window"
-msgstr ""
-
-#: ../bibletime/frontend/display/creaddisplay.cpp:72
-msgid "Print keys"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:87
-#: ../bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp:84
-msgid "Next book"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:88
-#: ../bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp:85
-msgid "Previous book"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:89
-#: ../bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp:86
-msgid "Next chapter"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:90
-#: ../bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp:87
-msgid "Previous chapter"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:91
-#: ../bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp:88
-msgid "Next verse"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:92
-#: ../bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp:89
-msgid "Previous verse"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:139
-msgid "Bible window"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:146
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:113
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:83
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:292
-msgid "Copy..."
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:147
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:115
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:132
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:84
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:91
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:293
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:300
-msgid "Reference only"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:149
-msgid "Text of reference"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:151
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:161
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:170
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:86
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:93
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:98
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:295
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:302
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:307
-msgid "Reference with text"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:153
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:172
-msgid "Chapter"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:156
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:120
-msgid "Selected text"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:160
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:124
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:90
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:299
-msgid "Save..."
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:163
-msgid "Chapter as plain text"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:165
-msgid "Chapter as HTML"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:169
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:131
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:97
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:306
-msgid "Print..."
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:265
-msgid "Copy chapter to clipboard ..."
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:265
-msgid "Copying"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:287
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:305
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:164
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:170
-msgid "Saving"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:287
-#: ../bibletime/frontend/displaywindow/cbiblereadwindow.cpp:305
-msgid "Saving chapter ..."
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbookreadwindow.cpp:96
-msgid "Toggle tree..."
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:60
-msgid "Transliteration"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:134
-msgid "Display options"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:137
-msgid "Use linebreaks after each verse"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:140
-msgid "Show versenumbers"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:142
-msgid "Show headings"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:146
-msgid "Highlight words of Jesus"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:148
-msgid "Show Strong's Numbers"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:162
-msgid "Use alternative textual variant"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cbuttons.cpp:167
-msgid "Display settings"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/ccommentaryreadwindow.cpp:54
-#: ../bibletime/frontend/displaywindow/chtmlwritewindow.cpp:63
-#: ../bibletime/frontend/displaywindow/cplainwritewindow.cpp:55
-msgid "Sync with active bible"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/chtmlwritewindow.cpp:72
-#: ../bibletime/frontend/displaywindow/cplainwritewindow.cpp:65
-msgid "Save text"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/chtmlwritewindow.cpp:83
-#: ../bibletime/frontend/displaywindow/cplainwritewindow.cpp:77
-msgid "Delete current entry"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/chtmlwritewindow.cpp:95
-#: ../bibletime/frontend/displaywindow/cplainwritewindow.cpp:89
-msgid "Restore original text"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:61
-msgid "Next entry"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:62
-msgid "Previous entry"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:106
-msgid "Lexicon window"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:117
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:134
-msgid "Entry with text"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:125
-msgid "Entry as plain text"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:127
-msgid "Entry as HTML"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:164
-#: ../bibletime/frontend/displaywindow/clexiconreadwindow.cpp:170
-msgid "Saving entry ..."
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cmodulechooserbutton.cpp:110
-#: ../bibletime/frontend/displaywindow/cmodulechooserbutton.cpp:152
-msgid "NONE"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cmodulechooserbutton.cpp:126
-#: ../bibletime/frontend/displaywindow/cmodulechooserbutton.cpp:127
-#: ../bibletime/frontend/displaywindow/cmodulechooserbutton.cpp:146
-msgid "Select a module"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cmodulechooserbutton.cpp:148
-msgid "Select an additional module"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cmodulechooserbutton.cpp:192
-msgid "[locked]"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cmodulechooserbutton.cpp:207
-msgid "No module selected"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/creadwindow.cpp:148
-msgid "Copy selected text"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cwritewindow.cpp:148
-msgid "Save text before closing?"
-msgstr ""
-
-#: ../bibletime/frontend/displaywindow/cwritewindow.cpp:172
-msgid "Save changed text?"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:263
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:335
-msgid "Take care, this module contains cult / questionable material!"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:265
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:306
-msgid "Language"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:267
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:316
-msgid "Unlock key"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:268
-msgid "not set"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:270
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:300
-msgid "Version"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:311
-msgid "Writable"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:312
-msgid "yes"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:330
-msgid "Features"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:472
-msgid "Print bookmark"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:479
-msgid "Change description ..."
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:479
-msgid "Enter a new description for the chosen bookmark."
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:576
-msgid "New folder"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:658
-msgid "Daily devotionals"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:664
-msgid "Bookmarks"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:667
-msgid "Old bookmarks"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:670
-#: ../bibletime/printing/cstyle.cpp:187
-msgid "Unknown"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:677
-msgid "Unknown language"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:1015
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:1023
-msgid ""
-"*.btb | BibleTime bookmark files (*.btb)\n"
-"*.* | All files (*.*)"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:1015
-msgid "BibleTime - Export bookmarks"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cindexitem.cpp:1023
-msgid "BibleTime - Import bookmarks"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:134
-msgid "Main index"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:136
-msgid "Create a new folder"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:137
-msgid "Change this folder"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:139
-msgid "Change this bookmark"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:140
-msgid "Import bookmarks"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:141
-msgid "Export bookmarks"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:142
-msgid "Print bookmarks"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:144
-msgid "Remove selected item(s)"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:146
-msgid "Edit this module"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:147
-msgid "Plain text"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:148
-msgid "HTML"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:150
-msgid "Search in selected module(s)"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:151
-msgid "Unlock this module"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:152
-msgid "About this module"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:435
-msgid "Delete Items"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:435
-msgid "Do you really want to delete the selected items and child-items?"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:473
-msgid "BibleTime - Unlock module"
-msgstr ""
-
-#: ../bibletime/frontend/mainindex/cmainindex.cpp:473
-msgid "Enter the unlock key for this module."
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:100
-msgid "Interrupt"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:100
-msgid "Search"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:100
-msgid "Search dialog"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:208
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:681
-msgid "Search options"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:212
-msgid "Search result"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:499
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:634
-#: ../bibletime/util/cresmgr.cpp:1073
-msgid "Choose modules"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:512
-msgid "Use chosen modules"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:562
-msgid "Search range editor"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:589
-msgid "Search range"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:597
-msgid "Add new range"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:601
-msgid "Delete current range"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:612
-msgid "Edit current search range:"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:622
-msgid "Parsed search range:"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:651
-msgid "New range"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:716
-msgid "<invalid name of search range>"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:772
-msgid "Search analysis"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:790
-msgid "Save search analysis as HTML"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:1185
-msgid "Save Search Analysis"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:1213
-msgid "BibleTime Search Analysis"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:1214
-msgid "Search text :"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:1215
-msgid "Search type :"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:1216
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:816
-msgid "No search scope"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:1216
-msgid "Search scope:"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:1220
-msgid "Total hits"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialog.cpp:1244
-msgid "Created by"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:73
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:280
-msgid "Found items"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:157
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:402
-msgid "Print search result..."
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:157
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:402
-msgid "Printing search result"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:168
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:187
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:384
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:393
-msgid "Save search result..."
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:168
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:187
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:384
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:393
-msgid "Saving search result"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:206
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:226
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:366
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:375
-msgid "Copy search result..."
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:206
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:226
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:366
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:375
-msgid "Copying search result"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:445
-msgid "Show search analysis"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:627
-msgid "Main search parameters"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:641
-msgid "Search text:"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:659
-msgid "Search type"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:661
-#: ../bibletime/util/cresmgr.cpp:1085
-msgid "Multiple words (AND)"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:667
-#: ../bibletime/util/cresmgr.cpp:1090
-msgid "Multiple words (OR)"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:671
-msgid "Exact"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:675
-#: ../bibletime/util/cresmgr.cpp:1100
-msgid "Regular expression"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:682
-msgid "Case sensitive search"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:688
-msgid "Search scope"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:696
-msgid "Setup custom ranges"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:702
-msgid "Search progress"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:706
-msgid "Current module:"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:709
-msgid "All modules:"
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:718
-msgid "Searching in: "
-msgstr ""
-
-#: ../bibletime/frontend/searchdialog/csearchdialogpages.cpp:817
-msgid "Last search result"
-msgstr ""
-
-#: ../bibletime/main.cpp:133
-msgid "Enable debug messages"
-msgstr ""
-
-#: ../bibletime/main.cpp:134
-msgid ""
-"Ignore the startup session that was saved when BibleTime was closed the last "
-"time."
-msgstr ""
-
-#: ../bibletime/main.cpp:135
-msgid ""
-"Open the default bible with the given key. Use <random> to open at a random "
-"position."
-msgstr ""
-
-#: ../bibletime/main.cpp:144
-msgid "Bible study tool for KDE"
-msgstr ""
-
-#: ../bibletime/main.cpp:146
-msgid "(c)1999-2003, The BibleTime Team"
-msgstr ""
-
-#: ../bibletime/main.cpp:147
-msgid ""
-"BibleTime is an easy to use but powerful Bible study tool for KDE.\n"
-"\n"
-"We are looking for developers and translators.\n"
-"If you'd like to join our team, please send an email to info@bibletime.info."
-msgstr ""
-
-#: ../bibletime/main.cpp:158
-msgid "Project coordinator"
-msgstr ""
-
-#: ../bibletime/main.cpp:160
-msgid "Frontend, backend"
-msgstr ""
-
-#: ../bibletime/main.cpp:162 ../bibletime/main.cpp:164
-msgid "Frontend"
-msgstr ""
-
-#: ../bibletime/main.cpp:166
-msgid "Icons, startlogo, webpage"
-msgstr ""
-
-#: ../bibletime/main.cpp:167
-msgid "Crystal icons, crystal startlogo, webpage"
-msgstr ""
-
-#: ../bibletime/main.cpp:169
-msgid "Documentation"
-msgstr ""
-
-#: ../bibletime/main.cpp:181
-msgid "Sponsored our internet domain for many years"
-msgstr ""
-
-#: ../bibletime/main.cpp:183
-msgid "Bible Study HowTo"
-msgstr ""
-
-#: ../bibletime/main.cpp:185
-msgid "Language codes and names"
-msgstr ""
-
-#: ../bibletime/main.cpp:188
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-
-#: ../bibletime/main.cpp:189
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-
-#: ../bibletime/main.cpp:220
-msgid "Starting BibleTime"
-msgstr ""
-
-#: ../bibletime/printing/cprintdialogpages.cpp:44
-#: ../bibletime/util/cresmgr.cpp:1333
-msgid "Styles"
-msgstr ""
-
-#: ../bibletime/printing/cprintdialogpages.cpp:49
-msgid "Margins (mm)"
-msgstr ""
-
-#: ../bibletime/printing/cprintdialogpages.cpp:56
-msgid "&Left"
-msgstr ""
-
-#: ../bibletime/printing/cprintdialogpages.cpp:56
-msgid "&Right"
-msgstr ""
-
-#: ../bibletime/printing/cprintdialogpages.cpp:56
-msgid "&Top"
-msgstr ""
-
-#: ../bibletime/printing/cprintdialogpages.cpp:106
-msgid "Available styles:"
-msgstr ""
-
-#: ../bibletime/printing/cprintdialogpages.cpp:175
-#: ../bibletime/printing/cprinter.cpp:61
-#: ../bibletime/printing/cprinter.cpp:394
-#: ../bibletime/printing/cprinter.cpp:403
-#: ../bibletime/printing/cstyleeditordialog.cpp:200
-msgid "Standard"
-msgstr ""
-
-#: ../bibletime/printing/cprintdialogpages.cpp:191
-msgid "Print queue"
-msgstr ""
-
-#: ../bibletime/printing/cprintdialogpages.cpp:202
-msgid "Use style:"
-msgstr ""
-
-#: ../bibletime/printing/cprintdialogpages.cpp:214
-msgid "Entries to print:"
-msgstr ""
-
-#: ../bibletime/printing/cprinter.cpp:80
-msgid "Black&amp;White for larger text portions"
-msgstr ""
-
-#: ../bibletime/printing/cprintitemlist.cpp:45
-msgid "From"
-msgstr ""
-
-#: ../bibletime/printing/cprintitemlist.cpp:46
-msgid "To"
-msgstr ""
-
-#: ../bibletime/printing/cprintitemlist.cpp:47
-msgid "Style"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:40
-msgid "Style editor"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:71
-msgid "Choose a part of the style:"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:73
-#: ../bibletime/printing/cstyleeditordialog.cpp:289
-msgid "Header"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:74
-#: ../bibletime/printing/cstyleeditordialog.cpp:293
-msgid "Description"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:75
-#: ../bibletime/printing/cstyleeditordialog.cpp:297
-msgid "Module text"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:81
-msgid "Enable this part"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:104
-msgid "Foreground:"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:115
-msgid "Background:"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:126
-msgid "Choose font"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:129
-msgid "Font preview"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:143
-msgid "Use frame"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:154
-msgid "Line thickness (pt):"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:162
-msgid "Frame color:"
-msgstr ""
-
-#: ../bibletime/printing/cstyleeditordialog.cpp:170
-msgid "Line style:"
-msgstr ""
-
-#: ../bibletime/rc-dummy.cpp:2
-msgid "&Search"
-msgstr ""
-
-#: ../bibletime/rc-dummy.cpp:5
-msgid "&Window"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:3
-msgid "The Bible was written so we could believe in Jesus. (John 20:31)\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:7
-msgid ""
-"BibleTime includes a really useful handbook written by Fred Saalbach.\n"
-"To read it choose the item \"Handbook\" in the \"Help\" menu of BibleTime.\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:12
-msgid ""
-"No one is allowed by God to add anything to or take anything away from the "
-"Word. (Revelation 22:18-19)\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:16
-msgid "The Bible is like a mirror. (James 1:23)\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:20
-msgid ""
-"BibleTime does include a <B>Bible Study HowTo</B>!\n"
-"It was written by Bob Harman and is a great introduction how to study the "
-"Bible.\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:25
-msgid ""
-"You can save, print and copy the whole search result by pressing the right "
-"mouse button on the icon of the searched module in the search dialog.\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:29
-msgid "The Bible is our only spiritual weapon. (Ephesians 6:17)\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:33
-msgid ""
-"To get the number of verses in the Bible search for a space in the module.\n"
-"The search analysis shows you the number of verses of each book.\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:38
-msgid "The Bible is truth. (John 17:17)\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:42
-msgid ""
-"If you would like to create a set of bookmarks around a specific topic with "
-"comments containing what the Lord told you here, it's best to\n"
-"make bookmarks from your personal commentary.\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:47
-msgid ""
-"The scriptures give us the wisdom that leads to salvation. (2 Timothy 3:15)\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:51
-msgid ""
-"To lookup the meaning of the original hebrew or greek word in a Bible "
-"supporting Strong's numbers, switch them on and \n"
-"click on the strong number. Now a new window showing the strong number with\n"
-"it's explanation is shown. If your favourite translation doesn't support "
-"Strong's numbers please refer to an alternate translation for the number of "
-"the corresponding word.\n"
-"Make sure you have set the default modules in the preferences.\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:58
-msgid ""
-"If you want to use a commentary as a topical reference, search it for terms "
-"your topic is about.\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:62
-msgid ""
-"In the beginning was the Word, the Word was with God, and the Word was God. "
-"(John 1:1)\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:66
-msgid ""
-"We will be judged on the last day by the words Jesus spoke. (John 12:48)\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:70
-msgid ""
-"If you want to find the full set of verses or entries on a area of content, "
-"you should use the option \"Multiple words (OR)\" for searching.\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:74
-msgid ""
-"If you are searching a verse you know only fuzzy or in a different "
-"translation search for the most probable terms in multiple Bible "
-"translations at the same time.\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:78
-msgid ""
-"God's Word can be a lamp to your feet and a light to your path. (Psalm "
-"119:105)\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:82
-msgid ""
-"If you want to search a word in a foreign module (e.g. greek or hebrew), "
-"open a display window and choose a chapter or an entry which contains this "
-"word.\n"
-"Select it and copy it to the clipboard. Now insert the copied word in the "
-"search text box of the searchdialog.\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:87
-msgid ""
-"The Word of God will not return to Him without accomplishing its purpose. "
-"(Isaiah 55:11)\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:91
-msgid ""
-"Foreign modules do often require a special font to display correctly. You "
-"can set the font for each language in the preferences.\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:95
-msgid ""
-"Did you know that the first book ever printed on a printing press was the "
-"Bible (by Johann Gutenberg, in 1492)?\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:99
-msgid ""
-"God has already given to us everything pertaining to life and godliness. (2 "
-"Peter 1:3)\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:103
-msgid ""
-"All important elements of BibleTime's graphical user interface have a "
-"tooltip and a \"What's this?\" help.<BR>\n"
-"To read the \"What's this?\" help press the keys SHIFT+F1 and click on the "
-"part.\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:108
-msgid ""
-"The Word of God is living, active, and sharper than any two-edged sword. "
-"(Hebrews 4:12)\n"
-msgstr ""
-
-#: ../bibletime/tips-dummy.cpp:112
-msgid ""
-"You are using a program that has been written for the glory of God.<BR>May "
-"He bless you as you study His Word!\n"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:900
-msgid "Clear the print queue of BibleTime."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:904
-msgid "Open the printer dialog"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:905
-msgid ""
-"Open the printer dialog of BibleTime, where you can edit the print queue, "
-"assign styles to the items and print them."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:909
-msgid "Close BibleTime"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:910
-msgid "Close BibleTime and save the settings."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:917
-msgid "Show main index"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:918
-msgid "Toggle the main index view."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:922
-msgid "Show main toolbar"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:923
-msgid "Toggle the main toolbar view."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:931 ../bibletime/util/cresmgr.cpp:1627
-msgid "Search in open modules"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:932
-msgid ""
-"Open the search dialog to search in all modules that are currently open."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:936
-msgid "Search default bible"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:937
-msgid "Open the search dialog to search in the default bible."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:945
-msgid "Load a session"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:946
-msgid "Restore a saved BibleTime session."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:950
-msgid "Save current session"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:951
-msgid "Save current BibleTime session so that it can be reused later."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:955
-msgid "Save as new session"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:956
-msgid "Create and save a new session."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:960
-msgid "Edit sessions"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:961
-msgid "Create new, delete or rename existing sessions."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:965
-msgid "Toggle fullscreen mode"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:966
-msgid "Toggle fullscreen mode of the main window."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:970
-msgid "Tile windows"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:971
-msgid "Tile the open display windows."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:975
-msgid "Cascade windows"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:976
-msgid "Cascade the open display windows."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:980
-msgid "Automatically tile windows"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:981
-msgid "Automatically tile the open display windows."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:985
-msgid "Automatically cascade windows"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:986
-msgid "Automatically cascade the open display windows."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:990
-msgid "Close all windows"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:991
-msgid "Close all open display windows."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:999
-msgid "Edit toolbar"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1000
-msgid "Open BibleTime's toolbar editor."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1004
-msgid "Configure BibleTime"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1005
-msgid "Open the dialog to set most of BibleTime's preferences."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1010
-msgid ""
-"Open the dialog to configure Sword and install/update/remove Sword modules."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1019
-msgid "BibleTime's handbook"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1020
-msgid ""
-"Open BibleTime's handbook in the KDE helpbrowser.<BR>The handbook explains "
-"how to use BibleTime in the best way."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1024
-msgid "BibleTime's Bible study HowTo"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1025
-msgid ""
-"Open the Bible study HowTo included with BibleTime in the KDE helpbrowser."
-"<BR>This HowTo is an introduction on how to study the Bible in an efficient "
-"way."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1029
-msgid "Enter \"What's this?\" mode"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1030
-msgid ""
-"Switch into the <B>\"What's this?\"</B> mode.<BR>All important elements of "
-"BibleTime's GUI offer a \"What's this?\" help message."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1034
-msgid "Send bugreport"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1035
-msgid "Send a bugreport to the developers of BibleTime."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1039
-msgid "Show daily tips at startup"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1040
-msgid ""
-"Show a daily tip each time BibleTime starts.<BR>The tips contain important "
-"Bible quotations and helpful tips for using BibleTime."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1044
-msgid "About BibleTime"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1045
-msgid "Show detailed information about BibleTime."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1049
-msgid "About KDE"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1050
-msgid "Show detailed information about the KDE project."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1060
-msgid "Start the search"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1061
-msgid "Start to search the text in each of the chosen modules."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1065
-msgid "Stop search"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1066
-msgid "Stop the active search."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1074
-msgid "Open a dialog to choose modules for the search."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1078
-msgid "Search text"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1079
-msgid "Enter the text you want to search in the chosen modules here."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1086
-msgid ""
-"Treat the search text as multiple words. A text must contain all of the "
-"words to match. The order of the words is unimportant."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1091
-msgid ""
-"Treat the search text as multiple words. A text must contain one or more "
-"words of to match. The order is unimportant."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1095
-msgid "Exact match"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1096
-msgid "The search text will be used exactly as entered."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1101
-msgid ""
-"Treat the search string as a GNU regular expression. The BibleTime handbook "
-"contains an introduction to regular expressions."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1109
-msgid "Case sensitive matching"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1110
-msgid ""
-"If you choose this option the search will distinguish between upper and "
-"lowercase characters."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1115
-msgid "Choose a search scope"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1116
-msgid ""
-"Choose a scope from the list. Select the first item to use no scope, the "
-"second one is to use each module's last search result as search scope. The "
-"others are user defined search scopes."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1122
-msgid "Available search scopes"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1123
-msgid "Select an item from the list to edit the search scope."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1127
-msgid "Search scope name"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1128
-msgid "Change the name of the selected search scope."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1132
-msgid "Edit search scope ranges"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1133
-msgid ""
-"Change the search ranges of the selected search scope item. Have a look at "
-"the predefined search scopes to see how search ranges are constructed."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1137
-msgid "Parsed search ranges"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1138
-msgid "Contains the search ranges which will be used for the search."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1142
-msgid "Add a new search scope"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1143
-msgid ""
-"Add a new search scope. First enter an appropriate name, then edit the "
-"search ranges."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1147
-msgid "Delete current search scope"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1148
-msgid ""
-"Deletes the selected search scope. If you close the dialog using Cancel the "
-"settings won't be saved."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1156
-msgid "Used modules"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1157
-msgid "The list of modules chosen for the search."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1161
-msgid "Found items of selected module"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1162
-msgid "This list contains the search result of the selected module."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1166
-msgid "Text preview"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1167
-msgid "The text preview of the selected search result item."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1178
-msgid "Scroll through the list"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1179
-msgid ""
-"This button is useful to scroll through the entries of the list. Press the "
-"button and move the mouse to increase or decrease the item."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1184
-msgid "List of books"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1185
-msgid "This list contains the books which are available in this module."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1189
-msgid "Show the next book"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1190
-msgid "Show the next book of this module."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1194
-msgid "Show the previous book"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1195
-msgid "Show the previous book of this module."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1199
-msgid "List of chapters"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1200
-msgid ""
-"This list contains the chapters which are available in the current book."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1204
-msgid "Show the next chapter"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1205
-msgid "Show the previous chapter of the module."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1209
-msgid "Show the previous chapter"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1210
-msgid "Show the next chapter of the module."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1214
-msgid "List of verses"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1215
-msgid ""
-"This list contains the verses which are available in the current chapter."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1219
-msgid "Jump to the next verse"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1220
-msgid ""
-"In  Bible texts, the next verse will be highlighted. In commentaries, the "
-"next entry will be shown."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1224
-msgid "Jump to the previous verse"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1225
-msgid ""
-"In Bible texts, the previous verse will be highlighted. In commentaries, the "
-"previous entry will be shown."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1232
-msgid "Synchronize with Bible windows"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1233
-msgid ""
-"Synchronize the displayed entry of this module with the active Bible window."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1240
-msgid "List of entries"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1241
-msgid "This list contains the entries of the current module."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1245
-msgid "Show the next entry"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1246
-msgid "The next entry of the module will be shown."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1250
-msgid "Show the previous entry"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1251
-msgid "The previous entry of the module will be shown."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1259
-msgid "Save the current text"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1260
-msgid "Save the curent text into the module. The old text will be overwritten."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1264
-msgid "Restore the old text"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1265
-msgid ""
-"Loads the old text from the module and loads it into the edit area. The "
-"unsaved text will be lost."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1269
-msgid "Delete the current entry"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1270
-msgid "Deletes the current entry out of the module. The text will be lost."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1276
-msgid "Bold text"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1277
-msgid "Toggle bold formatting of the selected text."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1281
-msgid "Italic text"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1282
-msgid "Toggle italic formatting of the selected text."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1286
-msgid "Underline text"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1287
-msgid "Toggle underlined formatting of the selected text."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1292
-msgid "Align left"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1293
-msgid "The text will be aligned on the left side of the page."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1298
-msgid "Centers the text horizontally."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1302
-msgid "Align right"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1303
-msgid "Aligns the text on the right side of the page."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1307
-msgid "Justify"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1308
-msgid "Justifies the text on the page."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1313
-msgid "Set the font"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1314
-msgid "Choose a new font for the selected text."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1317
-msgid "Set the font size"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1318
-msgid "Choose a new font size for the selected text."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1321
-msgid "Set the color"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1322
-msgid "Choose a new color for the selected text."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1334
-msgid "This list contains the available print styles."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1338
-msgid "List of print items"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1339
-msgid "This is the list which contains the items to be printed."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1343
-msgid "Move item up"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1344
-msgid "Move the selected item up one line."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1348
-msgid "Move item down"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1349
-msgid "Move the selected item down one line."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1353
-msgid "Delete items"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1354
-msgid "Delete the selected items."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1362
-msgid "New printing style"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1363
-msgid "Create a new printing style."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1368
-msgid "Delete printing style"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1369
-msgid "Remove the selected printing style from the list."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1374
-msgid "Edit printing style"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1375
-msgid "Change the properties of the selected printing style."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1382
-msgid "Size of page borders"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1382
-msgid ""
-"This group contains the page borders of the page measured in millimeters."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1385
-msgid "Upper border"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1386
-msgid "The size of the border on the top of the paper."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1390
-msgid "Lower border"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1391
-msgid "The size of the border on the bottom of the paper."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1395
-msgid "Left border"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1396
-msgid "The size of the border on the left side of the paper."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1400
-msgid "Right border"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1401
-msgid "The size of the border on the right side of the paper."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1412
-msgid "Show daily tip"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1413
-msgid "Activate this box to see a daily tip on startup."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1417
-msgid "Show startup logo"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1418
-msgid "Activate this to see the BibleTime logo on startup."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1422
-msgid "Restore the last BibleTime session on startup"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1423
-msgid ""
-"Save the user's session when BibleTime is closed and restore it on the next "
-"startup."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1430
-msgid "Choose a language"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1431
-msgid "The font selection below will apply to all texts in this language."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1438
-msgid "Text color"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1439
-msgid "The color used for normal text in the display windows."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1443
-msgid "Color of the background"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1444
-msgid "This is the background color used in display windows."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1448
-msgid "Link color"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1449
-msgid "The color used for all references into Sword modules."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1453
-msgid "Footnote color"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1454
-msgid "This color will be used for all footnotes in the display windows."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1459
-msgid ""
-"This color will be used for every Strong's Number in the display windows."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1463
-msgid "Color of the highlighted verse"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1464
-msgid "This is the color of the highlighted verse used in display windows."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1469
-msgid "All words spoken by Jesus will appear in this color."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1473
-msgid "Morphological tags"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1474
-msgid "All morphological tags will appear in this color."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1481
-msgid "List of sessions"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1482
-msgid "The list of available sessions."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1487
-msgid "Create a new, empty session with default settings."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1491
-msgid "Delete session"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1492
-msgid "Delete the selected session."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1497
-msgid "Rename the selected session."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1506
-msgid "Use cache files for the lexicon entries"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1507
-msgid ""
-"Activate this to let BibleTime create index files for the lexicon entries. "
-"This increases the speed of opening large lexicon modules significantly, but "
-"does consume some disk space. Recommended."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1512
-msgid "Check this to use the down arrow to scroll to the next verse."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1516
-msgid "List of languages"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1517
-msgid "Contains the languages which can be used for the biblical booknames."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1524
-msgid "The default bible used in the workspace area"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1525
-msgid "The default Bible is used when a hyperlink into a Bible is clicked."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1529
-msgid "The default commentary used in the workspace area"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1530
-msgid ""
-"The default commentary is used when a hyperlink into a commentary is clicked."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1534
-msgid "The default lexicon used in the workspace area"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1535
-msgid "The default lexicon is used when a hyperlink into a lexicon is clicked."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1539
-msgid "The default daily devotional module"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1540
-msgid ""
-"The default devotional will be used to display a short start up devotional."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1544
-msgid "The default Hebrew lexicon used in the workspace area"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1545
-msgid ""
-"The default Hebrew lexicon is used when a hyperlink into a Hebrew lexicon is "
-"clicked."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1549
-msgid "The default Greek lexicon used in the workspace area"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1550
-msgid ""
-"The default Greek lexicon is used when a hyperlink into a Greek lexicon is "
-"clicked."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1554
-msgid ""
-"The default Morphological lexicon for Hebrew texts used in the workspace area"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1555
-msgid ""
-"The standard morphological lexicon for Hebrew texts is used when a hyperlink "
-"of a morphological tag in a Hebrew text is clicked."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1559
-msgid ""
-"The default Morphological lexicon for Greek texts used in the workspace area"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1560
-msgid ""
-"The standard morphological lexicon for Greek texts is used when a hyperlink "
-"of a morphological tag in a Greek text is clicked."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1567
-msgid "Line breaks"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1568
-msgid "Insert line breaks after each verse."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1572
-msgid "Verse numbers"
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1573
-msgid "Show the verse number before each verse in Bibles."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1578
-msgid "Show footnotes embedded in the module's text."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1583
-msgid ""
-"Show Strong's Numbers embedded in the text of modules which support this "
-"feature."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1588
-msgid ""
-"Show tags providing morphological information in the text of modules which "
-"support this feature."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1593
-msgid ""
-"Show section headings in the text in the text of modules which support this "
-"feature."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1598
-msgid "Show root words."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1603
-msgid "Show hebrew vowel points in the text."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1608
-msgid "Show hebrew cantillation marks in the text."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1613
-msgid "Show greek accents in the text."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1618
-msgid "Use different variants from the textual sources."
-msgstr ""
-
-#: ../bibletime/util/cresmgr.cpp:1628
-msgid ""
-"Opens the search dialog to search in the modules that are currently open."
-msgstr ""
-
-#: ../bibletime/util/ctoolclass.cpp:84
-msgid "The file already exists."
-msgstr ""
-
-#: ../bibletime/util/ctoolclass.cpp:85
-msgid "Do you want to overwrite it?"
-msgstr ""
-
-#: ../bibletime/util/ctoolclass.cpp:105
-msgid "The file couldn't be saved."
-msgstr ""
-
-#: ../bibletime/util/ctoolclass.cpp:106
-msgid "Please check permissions etc."
-msgstr ""
-
-#: clanguagemgr.cpp:182
-msgid "Afrikaans"
-msgstr ""
-
-#: clanguagemgr.cpp:184
-msgid "English, Old (ca.450-1100)"
-msgstr ""
-
-#: clanguagemgr.cpp:185
-msgid "Arabic"
-msgstr ""
-
-#: clanguagemgr.cpp:188
-msgid "Azerbaijani"
-msgstr ""
-
-#: clanguagemgr.cpp:191
-msgid "Belarusian"
-msgstr ""
-
-#: clanguagemgr.cpp:192
-msgid "Bulgarian"
-msgstr ""
-
-#: clanguagemgr.cpp:197
-msgid "Breton"
-msgstr ""
-
-#: clanguagemgr.cpp:198
-msgid "Bosnian"
-msgstr ""
-
-#: clanguagemgr.cpp:200
-msgid "Catalan"
-msgstr ""
-
-#: clanguagemgr.cpp:202
-msgid "Cebuano"
-msgstr ""
-
-#: clanguagemgr.cpp:205
-msgid "Coptic"
-msgstr ""
-
-#: clanguagemgr.cpp:206
-msgid "Czech"
-msgstr ""
-
-#: clanguagemgr.cpp:207
-msgid "Church Slavic"
-msgstr ""
-
-#: clanguagemgr.cpp:209
-msgid "Welsh"
-msgstr ""
-
-#: clanguagemgr.cpp:211
-msgid "Danish"
-msgstr ""
-
-#: clanguagemgr.cpp:212
-msgid "German"
-msgstr ""
-
-#: clanguagemgr.cpp:215
-msgid "Greek, Modern (1453-)"
-msgstr ""
-
-#: clanguagemgr.cpp:217
-msgid "American English"
-msgstr ""
-
-#: clanguagemgr.cpp:218
-msgid "English, Middle (1100-1500)"
-msgstr ""
-
-#: clanguagemgr.cpp:219
-msgid "Esperanto"
-msgstr ""
-
-#: clanguagemgr.cpp:220
-msgid "Spanish"
-msgstr ""
-
-#: clanguagemgr.cpp:221
-msgid "Estonian"
-msgstr ""
-
-#: clanguagemgr.cpp:222
-msgid "Basque"
-msgstr ""
-
-#: clanguagemgr.cpp:225
-msgid "Finnish"
-msgstr ""
-
-#: clanguagemgr.cpp:228
-msgid "French"
-msgstr ""
-
-#: clanguagemgr.cpp:229
-msgid "Frisian"
-msgstr ""
-
-#: clanguagemgr.cpp:231
-msgid "Irish"
-msgstr ""
-
-#: clanguagemgr.cpp:232
-msgid "Gaelic (Scots)"
-msgstr ""
-
-#: clanguagemgr.cpp:236
-msgid "Gothic"
-msgstr ""
-
-#: clanguagemgr.cpp:237
-msgid "Manx"
-msgstr ""
-
-#: clanguagemgr.cpp:238
-msgid "Greek, Ancient (to 1453)"
-msgstr ""
-
-#: clanguagemgr.cpp:240
-msgid "Hebrew"
-msgstr ""
-
-#: clanguagemgr.cpp:241
-msgid "Hawaiian"
-msgstr ""
-
-#: clanguagemgr.cpp:245
-msgid "Hungarian"
-msgstr ""
-
-#: clanguagemgr.cpp:246
-msgid "Armenian"
-msgstr ""
-
-#: clanguagemgr.cpp:250
-msgid "Indonesian"
-msgstr ""
-
-#: clanguagemgr.cpp:253
-msgid "Icelandic"
-msgstr ""
-
-#: clanguagemgr.cpp:254
-msgid "Italian"
-msgstr ""
-
-#: clanguagemgr.cpp:257
-msgid "Japanese"
-msgstr ""
-
-#: clanguagemgr.cpp:259
-msgid "Georgian"
-msgstr ""
-
-#: clanguagemgr.cpp:266
-msgid "Korean"
-msgstr ""
-
-#: clanguagemgr.cpp:268
-msgid "Kurdish"
-msgstr ""
-
-#: clanguagemgr.cpp:271
-msgid "Kirghiz"
-msgstr ""
-
-#: clanguagemgr.cpp:273
-msgid "Latin"
-msgstr ""
-
-#: clanguagemgr.cpp:278
-msgid "Latvian"
-msgstr ""
-
-#: clanguagemgr.cpp:282
-msgid "Maori"
-msgstr ""
-
-#: clanguagemgr.cpp:284 clanguagemgr.cpp:380
-msgid "Macedonian"
-msgstr ""
-
-#: clanguagemgr.cpp:289
-msgid "Malay"
-msgstr ""
-
-#: clanguagemgr.cpp:290
-msgid "Maltese"
-msgstr ""
-
-#: clanguagemgr.cpp:296
-msgid "Low German; Low Saxon"
-msgstr ""
-
-#: clanguagemgr.cpp:299
-msgid "Dutch"
-msgstr ""
-
-#: clanguagemgr.cpp:301
-msgid "Norwegian"
-msgstr ""
-
-#: clanguagemgr.cpp:312
-msgid "Papiamento"
-msgstr ""
-
-#: clanguagemgr.cpp:314
-msgid "Polish"
-msgstr ""
-
-#: clanguagemgr.cpp:316
-msgid "Portuguese"
-msgstr ""
-
-#: clanguagemgr.cpp:323
-msgid "Romanian"
-msgstr ""
-
-#: clanguagemgr.cpp:324
-msgid "Russian"
-msgstr ""
-
-#: clanguagemgr.cpp:329
-msgid "Scots"
-msgstr ""
-
-#: clanguagemgr.cpp:334
-msgid "Slovak"
-msgstr ""
-
-#: clanguagemgr.cpp:335
-msgid "Slovenian"
-msgstr ""
-
-#: clanguagemgr.cpp:338
-msgid "Somali"
-msgstr ""
-
-#: clanguagemgr.cpp:339
-msgid "Albanian"
-msgstr ""
-
-#: clanguagemgr.cpp:344
-msgid "Swedish"
-msgstr ""
-
-#: clanguagemgr.cpp:345
-msgid "Swahili"
-msgstr ""
-
-#: clanguagemgr.cpp:346
-msgid "Syriac"
-msgstr ""
-
-#: clanguagemgr.cpp:348
-msgid "Tamil"
-msgstr ""
-
-#: clanguagemgr.cpp:351
-msgid "Thai"
-msgstr ""
-
-#: clanguagemgr.cpp:353
-msgid "Tagalog"
-msgstr ""
-
-#: clanguagemgr.cpp:354
-msgid "Tswana"
-msgstr ""
-
-#: clanguagemgr.cpp:355
-msgid "Turkish"
-msgstr ""
-
-#: clanguagemgr.cpp:359
-msgid "Tahitian"
-msgstr ""
-
-#: clanguagemgr.cpp:362
-msgid "Ukrainian"
-msgstr ""
-
-#: clanguagemgr.cpp:366
-msgid "Vietnamese"
-msgstr ""
-
-#: clanguagemgr.cpp:371
-msgid "Xhosa"
-msgstr ""
-
-#: clanguagemgr.cpp:373
-msgid "Bavarian"
-msgstr ""
-
-#: clanguagemgr.cpp:374
-msgid "Alemannisch"
-msgstr ""
-
-#: clanguagemgr.cpp:375
-msgid "Haitian Creole French"
-msgstr ""
-
-#: clanguagemgr.cpp:376
-msgid "Itzá"
-msgstr ""
-
-#: clanguagemgr.cpp:377
-msgid "Shuar"
-msgstr ""
-
-#: clanguagemgr.cpp:378
-msgid "Kekchí"
-msgstr ""
-
-#: clanguagemgr.cpp:379
-msgid "Lombard"
-msgstr ""
-
-#: clanguagemgr.cpp:381
-msgid "Tok Pisin"
-msgstr ""
-
-#: clanguagemgr.cpp:382
-msgid "Uma"
-msgstr ""
-
-#: clanguagemgr.cpp:383
-msgid "Romani, Vlax"
-msgstr ""
-
-#: clanguagemgr.cpp:384
-msgid "Sango"
-msgstr ""
-
-#: clanguagemgr.cpp:385
-msgid "Sranan"
-msgstr ""
-
-#: clanguagemgr.cpp:390
-msgid "Chinese"
-msgstr ""
-
-#: clanguagemgr.cpp:391
-msgid "Zulu"
-msgstr ""
diff --git a/pot/preparetips b/pot/preparetips
deleted file mode 100755
index 1e5c35a..0000000
--- a/pot/preparetips
+++ /dev/null
@@ -1,45 +0,0 @@
-# !/usr/bin/perl
-# little script to extract the text from the tips file
-# and output it, so xgettext can add the tips to the po file
-#
-# 2000 by Matthias Kiefer <matthias.kiefer@gmx.de>
-# Command line option added by Joachim Ansorg
-
-open(FILE,"<$ARGV[0]") || die "unable to open tips file";
-
-$inTip=0;
-
-while(<FILE>)
-{
-	chomp;
-
-	# tip starts with <html>
-	if(/^\s*<html>/i)
-	{
-		$inTip=1;
-		print "\ni18n(\n";
-		next;
-	}	
-
-	if($inTip!=0)
-	{
-		# tip ends with </html>
-		if(/^\s*<\/html>/i)
-		{
-			print ");\n";
-			$inTip=0;
-		}
-		else
-		{
-			# replace \ with \\
-			s/\\/\\\\/g;
-
-			# replace " with \"
-			s/"/\\"/g;
-			
-			print "\"$_\\n\"\n";
-		}
-	}   
-}
-
-close(FILE);
diff --git a/setupwizard.kdevprj b/setupwizard.kdevprj
deleted file mode 100644
index 95eab8c..0000000
--- a/setupwizard.kdevprj
+++ /dev/null
@@ -1,152 +0,0 @@
-[Config for BinMakefileAm]
-addcxxflags=
-bin_program=btsetupwizard
-cflags=
-cppflags=
-cxxflags=\s-O0 -g3 -Wall
-ldadd=
-ldflags=\s    \s
-libtool_dir=
-path_to_bin_program=./setupwizard
-
-[General]
-AMChanged=false
-author=The BibleTime team
-configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux\s
-dir_where_make_will_be_called=./
-email=info@bibletime.de
-execute_args=--start-bibletime
-kdevprj_version=1.3
-lfv_open_groups=
-make_options=\s-j1
-makefiles=Makefile.am,bibleinstaller/Makefile.am,bibleinstaller/docs/Makefile.am,bibleinstaller/docs/en/Makefile.am,setupwizard/Makefile.am,bibleinstaller/setupwizard/Makefile.am
-modifyMakefiles=false
-project_name=SetupWizard
-project_type=normal_empty
-short_info=
-sub_dir=bibleinstaller/
-version=1.3pre
-version_control=CVS
-workspace=1
-
-[LFV Groups]
-Andere=*
-Benutzerschnittstelle=*.kdevdlg,*.ui,*.rc,*.dlg
-Header=*.h,*.hh,*.hxx,*.hpp,*.H
-Quellen=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l
-groups=Header,Quellen,Benutzerschnittstelle,Andere
-
-[Makefile.am]
-files=bibleinstaller.kdevprj
-sub_dirs=bibleinstaller,setupwizard
-type=normal
-
-[bibleinstaller.kdevprj]
-dist=true
-install=false
-install_location=
-type=DATA
-
-[bibleinstaller/Makefile.am]
-sub_dirs=setupwizard
-type=prog_main
-
-[bibleinstaller/docs/Makefile.am]
-sub_dirs=
-type=normal
-
-[bibleinstaller/docs/en/Makefile.am]
-sub_dirs=
-type=normal
-
-[bibleinstaller/setupwizard/Makefile.am]
-files=bibleinstaller/setupwizard/installer.cpp,bibleinstaller/setupwizard/installer.h,bibleinstaller/setupwizard/installpage_1.cpp,bibleinstaller/setupwizard/installpage_1.h,bibleinstaller/setupwizard/install.cpp,bibleinstaller/setupwizard/install.h
-sharedlib_LDFLAGS=-version-info 0:0:0
-sharedlib_rootname=setupwizard
-sub_dirs=
-type=static_library
-
-[bibleinstaller/setupwizard/install.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibleinstaller/setupwizard/install.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibleinstaller/setupwizard/installer.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibleinstaller/setupwizard/installer.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[bibleinstaller/setupwizard/installpage_1.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[bibleinstaller/setupwizard/installpage_1.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[setupwizard/Makefile.am]
-files=setupwizard/btsetupwizard.cpp,setupwizard/btsetupwizard.h,setupwizard/main.cpp,setupwizard/install.h,setupwizard/install.cpp,setupwizard/remove.h,setupwizard/remove.cpp
-sharedlib_LDFLAGS=-version-info 0:0:0
-sharedlib_rootname=setupwizard
-sub_dirs=
-type=static_library
-
-[setupwizard/btsetupwizard.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[setupwizard/btsetupwizard.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[setupwizard/install.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[setupwizard/install.h]
-dist=true
-install=false
-install_location=
-type=HEADER
-
-[setupwizard/main.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[setupwizard/remove.cpp]
-dist=true
-install=false
-install_location=
-type=SOURCE
-
-[setupwizard/remove.h]
-dist=true
-install=false
-install_location=
-type=HEADER
diff --git a/stamp-h.in b/stamp-h.in
deleted file mode 100644
index e69de29..0000000
--- a/stamp-h.in
+++ /dev/null
diff --git a/subdirs b/subdirs
deleted file mode 100644
index 0d47987..0000000
--- a/subdirs
+++ /dev/null
@@ -1,4 +0,0 @@
-bibletime
-debian
-docs
-pot
diff --git a/sword.m4 b/sword.m4
deleted file mode 100644
index 341df39..0000000
--- a/sword.m4
+++ /dev/null
@@ -1,227 +0,0 @@
-##	-*- autoconf -*-
-dnl This file was created by Joachim Ansorg <joachim@ansorgs.de>
-dnl It provides macord for the autoconf package to find the Sword library on your system.
-
-dnl ----------------------------------------------------------------------
-dnl		Check wheter to use static linking
-dnl		first parameter is the required version
-dnl		second is whether to use static sword library
-dnl ----------------------------------------------------------------------
-AC_DEFUN(AC_CHECK_SWORD,
-[
-dnl AC_MSG_CHECKING([for a Sword installation])
-
-dnl The option for the configure script
-AC_ARG_WITH(sword-dir,
-[  --with-sword-dir=DIR     Path where Sword is being installed (default=/usr) ],
-[
-  ac_sword_dir=$withval
-],ac_sword_dir=/usr
-)
-
-AC_ARG_ENABLE(static-sword,
-[  --enable-static-sword    Link to the static Sword library],
- 	ac_static_sword="YES",
- 	[ ac_static_sword="$2" ]
-)
-
-dnl try to find Sword library files
-AC_MSG_CHECKING([for Sword library files])
-AC_REQUIRE([AC_FIND_ZLIB])
-ac_sword_library_dirs="$ac_sword_dir/lib /usr/lib /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
-
-if test "x$ac_static_sword" = "xYES"; then
-	SEARCH_LIBS="libsword.a";
-else
-	SEARCH_LIBS="libsword.so libsword.a";
-fi
-
-
-AC_CACHE_VAL(ac_cv_sword_libdir, AC_FIND_FILE($SEARCH_LIBS, $ac_sword_library_dirs, ac_cv_sword_libdir))
-
-if test "x$ac_cv_sword_libdir" = "xNO"; then
-  AC_MSG_ERROR(SWORD library not found. Try to use configure with --with-sword-dir=/your/SWORD/path!);
-fi
-
-if test "x$ac_static_sword" = "xYES"; then
-	LIB_SWORD="$ac_cv_sword_libdir/libsword.a";
-else
-	LIB_SWORD="-lsword";
-fi
-
-AC_SUBST(SWORD_LIBRARY_PATH)
-AC_SUBST(LIB_SWORD)
-all_libraries="$all_libraries -L$ac_cv_sword_libdir"
-
-if test "x$ac_static_sword" = "xYES"; then
-	MESSAGE="static library $ac_cv_sword_libdir/libsword.a";
-else
-	MESSAGE="$ac_cv_sword_libdir";
-fi
-AC_MSG_RESULT([$MESSAGE])
-
-dnl -- try to find Swords include files --
-AC_MSG_CHECKING([for Sword include files])
-ac_sword_include_dirs="$ac_sword_dir/include/sword $ac_sword_dir/include /usr/include/sword /usr/include /usr/local/include/sword /usr/local/include /usr/local/sword/include /usr/local/sword/include/sword"
-
-AC_CACHE_VAL(ac_cv_sword_incdir, AC_FIND_FILE(swmgr.h, $ac_sword_include_dirs, ac_cv_sword_incdir))
-
-if test "x$ac_cv_sword_incdir" = "xNO"; then
-	AC_MSG_ERROR([The Sword include file files were not found.
-Please try to use configure with --with-sword-dir=/your/SWORD/path !
-])
-fi
-
-SWORD_INCLUDES="-I$ac_cv_sword_incdir"
-AC_SUBST(SWORD_INCLUDES)
-all_includes="$all_includes -I$ac_cv_sword_incdir"
-
-AC_MSG_RESULT([$ac_cv_sword_incdir])
-
-
-
-dnl -- Sword version tests --
-dnl First test for installed Sword version
-dnl Then check if it's recent enough
-
-AC_MSG_CHECKING([for installed Sword version])
-
-AC_CACHE_VAL(ac_cv_installed_sword_version,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$"
-LDFLAGS="$LDFLAGS -L$ac_cv_sword_libdir"
-LIBS="$LIB_SWORD -lz"
-LD_LIBRARY_PATH="$ac_cv_sword_libdir"
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-cat > conftest.$ac_ext <<EOF
-#include <iostream>
-#include <swversion.h>
-
-#ifdef SWORD_NAMESPACE_START
-using namespace sword;
-#endif
-
-int main(int argc, char* argv[]) {
-	std::cout << SWVersion::currentVersion << std::endl;
-	return 0;
-}
-EOF
-
-
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-	if test -x conftest; then
-		eval ac_cv_installed_sword_version=`./conftest 2>&5`
-	fi
-else
-  echo "configure: failed program was:" >&AC_FD_CC
-  AC_MSG_ERROR([Failed to compile the test program to check the Sword version! Please have a look at config.log! Report this to the BibleTime developers!]);
-  cat conftest.$ac_ext >&AC_FD_CC
-fi
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_RESTORE
-])
-AC_MSG_RESULT([$ac_cv_installed_sword_version])
-
-
-
-
-dnl *** Now check if the installed version is recent enough
-AC_MSG_CHECKING([whether your Sword installation is recent enough])
-
-AC_CACHE_VAL(ac_cv_sword_recent_version,
-[
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-ac_LD_LIBRARY_PATH_safe=$LD_LIBRARY_PATH
-ac_LIBRARY_PATH="$LIBRARY_PATH"
-ac_cxxflags_safe="$CXXFLAGS"
-ac_ldflags_safe="$LDFLAGS"
-ac_libs_safe="$LIBS"
-
-CXXFLAGS="$CXXFLAGS -I$"
-LDFLAGS="$LDFLAGS -L$ac_cv_sword_libdir"
-LIBS="$LIB_SWORD -lz"
-LD_LIBRARY_PATH="$ac_cv_sword_libdir"
-export LD_LIBRARY_PATH
-LIBRARY_PATH=
-export LIBRARY_PATH
-
-cat > conftest.$ac_ext <<EOF
-#include <iostream>
-#include <swversion.h>
-
-#ifdef SWORD_NAMESPACE_START
-using namespace sword;
-#endif
-
-
-int main(int argc, char* argv[[]]) {
-	if (argc == 2) { //compare required with installed Sword version
-		const char* requiredVersion( argv[[1]] );
-		if ( (SWVersion( requiredVersion ) < SWVersion::currentVersion) || (SWVersion( requiredVersion ) == SWVersion::currentVersion) ) {
-			std::cout << "ok";
-			return -1;
-		}
-		else {
-			std::cout << "not-ok";
-			return -2; //version not recent enough
-		}
-	}
-	return 0;
-}
-EOF
-
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-if AC_TRY_EVAL(ac_link) && test -s conftest; then
-	if test -x conftest; then
-		eval ac_cv_sword_recent_version=`./conftest $1 2>&5`
-	fi
-else
-  echo "configure: failed program was:" >&AC_FD_CC
-  AC_MSG_ERROR([Failed to compile the test program to check the Sword version! Please have a look at config.log! Report this to the BibleTime developers!]);
-  cat conftest.$ac_ext >&AC_FD_CC
-fi;
-
-rm -f conftest*
-CXXFLAGS="$ac_cxxflags_safe"
-LDFLAGS="$ac_ldflags_safe"
-LIBS="$ac_libs_safe"
-
-LD_LIBRARY_PATH="$ac_LD_LIBRARY_PATH_safe"
-export LD_LIBRARY_PATH
-LIBRARY_PATH="$ac_LIBRARY_PATH"
-export LIBRARY_PATH
-AC_LANG_RESTORE
-])
-
-if test "x$ac_cv_sword_recent_version" = "xok"; then
-	AC_MSG_RESULT([yes]);
-elif test "x$ac_cv_sword_recent_version" = "xnot-ok"; then
-	AC_MSG_RESULT([no]);
-	AC_MSG_ERROR([Your Sword installation is not recent enought! Please upgrade to version $1! Get the Sword library at www.crosswire.org.]);
-else
-	AC_MSG_ERROR([Invalid return code of the internal Sword version test program. Please submit a bugreport!]);
-fi;
-
-])